diff --git a/launcher/src/main/java/io/gitlab/jfronny/inceptum/launcher/util/GameVersionParser.java b/launcher/src/main/java/io/gitlab/jfronny/inceptum/launcher/util/GameVersionParser.java
index 6023082..570acde 100644
--- a/launcher/src/main/java/io/gitlab/jfronny/inceptum/launcher/util/GameVersionParser.java
+++ b/launcher/src/main/java/io/gitlab/jfronny/inceptum/launcher/util/GameVersionParser.java
@@ -8,11 +8,15 @@ public class GameVersionParser {
     }
 
     public static String getGameVersion(String version) {
-        return version.startsWith(FABRIC_PREFIX) ? version.substring(version.lastIndexOf('-') + 1) : version;
+        if (!isFabric(version)) return version;
+        version = version.substring(FABRIC_PREFIX.length());
+        return version.substring(version.indexOf('-') + 1);
     }
 
     public static String getLoaderVersion(String version) {
-        return !isFabric(version) ? null : version.substring(FABRIC_PREFIX.length(), version.lastIndexOf('-'));
+        if (!isFabric(version)) return null;
+        version = version.substring(FABRIC_PREFIX.length());
+        return version.substring(0, version.indexOf('-'));
     }
 
     public static String createVersionWithFabric(String gameVersion, String fabricVersion) {