diff --git a/.gitignore b/.gitignore
index 2dd232a..c22727e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,4 @@ jasmin.jar
 TestClass.stups
 *.svg
 *.dot
+/TestClass.java
diff --git a/src/main/java/StupsCompiler.java b/src/main/java/StupsCompiler.java
index 8c1f40a..ecd85c1 100644
--- a/src/main/java/StupsCompiler.java
+++ b/src/main/java/StupsCompiler.java
@@ -48,7 +48,8 @@ public final class StupsCompiler {
         Logger.call(graph::printToImage);
 
         // Codegeneration + Output
-        final String outputName = filename.replaceFirst("\\.stups", ".j");
+        final String fileExtension = filename.substring(filename.lastIndexOf('.') + 1);
+        final String outputName = filename.replaceFirst("\\." + fileExtension, ".j");
         final String sourceCode = graph.toString();
         try {
             final Path outputFile = Paths.get(System.getProperty("user.dir") + "/" + outputName);