diff --git a/NewHorizons/Patches/RemotePatches.cs b/NewHorizons/Patches/RemotePatches.cs
index 0de131be..40c6a5c2 100644
--- a/NewHorizons/Patches/RemotePatches.cs
+++ b/NewHorizons/Patches/RemotePatches.cs
@@ -101,7 +101,8 @@ namespace NewHorizons.Patches
                     break;
                 default:
                     var key = RemoteHandler.GetPlatformIDKey(id);
-                    switch (key.Substring(0, key.IndexOf("_")))
+                    var _ = key.IndexOf("_");
+                    switch ((_ == -1) ? key : key.Substring(0, _))
                     {
                         case "SS":
                             __result = "SolarSystem";