diff --git a/AUTHORS b/AUTHORS
index cfa052bb..4e0add50 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -54,3 +54,6 @@ Chris Smowton
 Scott Spillers <scotts@paravelsystems.com>
    The original Icon set
 
+David Klann <dklann@broadcasttool.com>
+   Some small bug fixes
+
diff --git a/ChangeLog b/ChangeLog
index 4205f993..2414f258 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -20702,3 +20702,6 @@
 2020-12-24 Fred Gleason <fredg@paravelsystems.com>
 	* Modified the schema map in rddbmgr(8) to position schema update
 	347 as part of v3.6.x.
+2021-01-17 David Klann <dklann@broadcasttool.com>
+	* Fixed bug in lib/rdwavefile.cpp that copied CartChunk Cut ID
+	past the end of the first "NULL" character.
diff --git a/lib/rdwavefile.cpp b/lib/rdwavefile.cpp
index 7cee7d9d..d6534fcb 100644
--- a/lib/rdwavefile.cpp
+++ b/lib/rdwavefile.cpp
@@ -4644,6 +4644,7 @@ QString RDWaveFile::cutString(char *buffer,unsigned start_point,unsigned size)
   QString string;
 
   for(unsigned i=start_point;i<start_point+size;i++) {
+    if(!(buffer[i])) break;
     string=string.append(buffer[i]);
   }