diff --git a/library.json b/library.json
index 7e5fe22a..5dd7a777 100644
--- a/library.json
+++ b/library.json
@@ -14,7 +14,7 @@
         "type": "git",
          "url": "https://github.com/earlephilhower/ESP8266Audio"
     },
-    "version": "1.1",
+    "version": "1.1.1",
     "homepage": "https://github.com/earlephilhower/ESP8266Audio",
     "frameworks": "Arduino",
     "examples": [
diff --git a/library.properties b/library.properties
index 2301f86c..9366757b 100644
--- a/library.properties
+++ b/library.properties
@@ -1,5 +1,5 @@
 name=ESP8266Audio
-version=1.1
+version=1.1.1
 author=Earle F. Philhower, III
 maintainer=Earle F. Philhower, III
 sentence=Audio file and I2S sound playing routines.
diff --git a/src/AudioFileSourceID3.cpp b/src/AudioFileSourceID3.cpp
index a90020a2..1723b8d4 100644
--- a/src/AudioFileSourceID3.cpp
+++ b/src/AudioFileSourceID3.cpp
@@ -218,12 +218,12 @@ uint32_t AudioFileSourceID3::read(void *data, uint32_t len)
         if (i<sizeof(value)-1) value[i] = id3.getByte();
         else (void)id3.getByte();
       }
-      value[i] = 0; // Terminate the string...
+      value[i<sizeof(value)-1?i:sizeof(value)-1] = 0; // Terminate the string...
       if ( (frameid[0]=='T' && frameid[1]=='A' && frameid[2]=='L' && frameid[3] == 'B' ) ||
            (frameid[0]=='T' && frameid[1]=='A' && frameid[2]=='L' && rev==2) ) {
         cb.md("Album", isUnicode, value);
       } else if ( (frameid[0]=='T' && frameid[1]=='I' && frameid[2]=='T' && frameid[3] == '2') ||
-                  (frameid[i]=='T' && frameid[1]=='T' && frameid[2]=='2' && rev==2) ) {
+                  (frameid[0]=='T' && frameid[1]=='T' && frameid[2]=='2' && rev==2) ) {
         cb.md("Title", isUnicode, value);
       } else if ( (frameid[0]=='T' && frameid[1]=='P' && frameid[2]=='E' && frameid[3] == '1') ||
                   (frameid[0]=='T' && frameid[1]=='P' && frameid[2]=='1' && rev==2) ) {