diff --git a/src/libFLAC/format.c b/src/libFLAC/format.c
index 42e09036..5f14d68a 100644
--- a/src/libFLAC/format.c
+++ b/src/libFLAC/format.c
@@ -267,7 +267,7 @@ static __inline unsigned utf8len_(const FLAC__byte *utf8)
 		return 1;
 	}
 	else if ((utf8[0] & 0xE0) == 0xC0 && (utf8[1] & 0xC0) == 0x80) {
-		if ((utf8[0] & 0x01) == 0xC0) /* overlong sequence check */
+		if ((utf8[0] & 0xFE) == 0xC0) /* overlong sequence check */
 			return 0;
 		return 2;
 	}
diff --git a/src/plugin_common/tags.c b/src/plugin_common/tags.c
index f580f44f..1eec6369 100644
--- a/src/plugin_common/tags.c
+++ b/src/plugin_common/tags.c
@@ -46,7 +46,7 @@ static __inline unsigned local__utf8len(const FLAC__byte *utf8)
 		return 1;
 	}
 	else if ((utf8[0] & 0xE0) == 0xC0 && (utf8[1] & 0xC0) == 0x80) {
-		if ((utf8[0] & 0x01) == 0xC0) /* overlong sequence check */
+		if ((utf8[0] & 0xFE) == 0xC0) /* overlong sequence check */
 			return 0;
 		return 2;
 	}