diff --git a/core/src/main/java/io/xpipe/core/FilePath.java b/core/src/main/java/io/xpipe/core/FilePath.java
index a1174f54e..ae09024ab 100644
--- a/core/src/main/java/io/xpipe/core/FilePath.java
+++ b/core/src/main/java/io/xpipe/core/FilePath.java
@@ -120,10 +120,11 @@ public final class FilePath {
     }
 
     public FilePath getBaseName() {
-        var split = value.lastIndexOf(".");
-        if (split == -1) {
+        if (!getFileName().contains(".")) {
             return this;
         }
+
+        var split = value.lastIndexOf(".");
         return FilePath.of(value.substring(0, split));
     }