diff --git a/main/src/main/java/com/sedmelluq/discord/lavaplayer/container/ogg/OggMetadata.java b/main/src/main/java/com/sedmelluq/discord/lavaplayer/container/ogg/OggMetadata.java
index 790aa5f4..44083d24 100644
--- a/main/src/main/java/com/sedmelluq/discord/lavaplayer/container/ogg/OggMetadata.java
+++ b/main/src/main/java/com/sedmelluq/discord/lavaplayer/container/ogg/OggMetadata.java
@@ -16,7 +16,7 @@ public class OggMetadata implements AudioTrackInfoProvider {
     private static final String ARTIST_FIELD = "ARTIST";
 
     private final Map<String, String> tags;
-    private final long length;
+    private final Long length;
 
     /**
      * @param tags Map of OGG metadata with OGG-specific keys.
diff --git a/main/src/main/java/com/sedmelluq/discord/lavaplayer/container/ogg/vorbis/VorbisCommentParser.java b/main/src/main/java/com/sedmelluq/discord/lavaplayer/container/ogg/vorbis/VorbisCommentParser.java
index 6de3a07f..35ec4e88 100644
--- a/main/src/main/java/com/sedmelluq/discord/lavaplayer/container/ogg/vorbis/VorbisCommentParser.java
+++ b/main/src/main/java/com/sedmelluq/discord/lavaplayer/container/ogg/vorbis/VorbisCommentParser.java
@@ -2,6 +2,7 @@
 
 import java.nio.ByteBuffer;
 import java.util.HashMap;
+import java.util.Locale;
 import java.util.Map;
 
 import static java.nio.charset.StandardCharsets.UTF_8;
@@ -54,7 +55,7 @@ public static Map<String, String> parse(ByteBuffer tagBuffer, boolean truncated)
     private static void storeTagToMap(Map<String, String> tags, byte[] data) {
         for (int i = 0; i < data.length; i++) {
             if (data[i] == '=') {
-                tags.put(new String(data, 0, i, UTF_8), new String(data, i + 1, data.length - i - 1, UTF_8));
+                tags.put(new String(data, 0, i, UTF_8).toUpperCase(Locale.ROOT), new String(data, i + 1, data.length - i - 1, UTF_8));
                 break;
             }
         }