diff --git a/Conv2PSV/Program.cs b/Conv2PSV/Program.cs
index f53d6cc..d0f777d 100644
--- a/Conv2PSV/Program.cs
+++ b/Conv2PSV/Program.cs
@@ -79,30 +79,18 @@ namespace Conv2PSV
         {
             String PsvName = "";
             char[] SaveArray = SaveName.ToArray();
-            bool DashFound = false;
-            foreach(char SaveChar in SaveArray)
+            for (int i = 0; i < SaveArray.Length; i++)
             {
-                if(!DashFound)
+                if (i < 0xC)
                 {
-                    if (SaveChar == '-')
-                    {
-                        DashFound = true;
-                    }
-                    PsvName += SaveChar;
+                    PsvName += SaveArray[i];
                 }
                 else
                 {
-                    if (Char.IsDigit(SaveChar))
-                    {
-                        PsvName += SaveChar;
-                    }
-                    else
-                    {
-                        PsvName += String.Format("{0:X}", Convert.ToInt32(SaveChar));
-                    }
+                    PsvName += String.Format("{0:X}", Convert.ToInt32(SaveArray[i]));
                 }
-
             }
+
             PsvName += ".PSV";
             return PsvName;
         }