diff --git a/Comparison/src/main/java/cz/fidentis/analyst/Project.java b/Comparison/src/main/java/cz/fidentis/analyst/Project.java
index ffcf7cfa5eb69eb99007f00411e244486bc58b3b..73a0fd18cc968d03230a432a07cf1572814c2951 100644
--- a/Comparison/src/main/java/cz/fidentis/analyst/Project.java
+++ b/Comparison/src/main/java/cz/fidentis/analyst/Project.java
@@ -4,6 +4,7 @@ import cz.fidentis.analyst.face.HumanFace;
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -218,7 +219,8 @@ public class Project {
                 Path path = this.getCfg().getPathToFaceByName(name);
                 File file = path.toFile();
                 face = new HumanFace(file, true); // loads also landmarks, if exist
-                Path preview = path.resolveSibling(name.concat("_preview.jpg"));
+                //Path preview = path.resolveSibling(name.concat("_preview.jpg"));
+                Path preview = Paths.get(face.getPath().split(".obj")[0] + "_preview.jpg");
                 face.setPreview(preview);
                 this.addFace(face);
                 out.printDuration("Loaded model " + face.getShortName() +" with " + face.getMeshModel().getNumVertices() + " vertices");
diff --git a/GUI/src/main/java/cz/fidentis/analyst/project/FaceStatePanel.java b/GUI/src/main/java/cz/fidentis/analyst/project/FaceStatePanel.java
index e31ac69abaf046286a1152a73859fa011cb9585c..cfd4b4d3920d52c33d0b5d8b0dad437edc5c75ac 100644
--- a/GUI/src/main/java/cz/fidentis/analyst/project/FaceStatePanel.java
+++ b/GUI/src/main/java/cz/fidentis/analyst/project/FaceStatePanel.java
@@ -326,9 +326,7 @@ public class FaceStatePanel extends ControlPanel {
             }
             
         } else if (path != null && path.toFile().exists()) {
-            String pathString = path.toString();
-            String name = pathString.substring(0, pathString.lastIndexOf('.')); // remove extention
-            Path preview = Paths.get(name.concat("_preview.jpg"));
+            Path preview = Paths.get(path.toString().split(".obj")[0] + "_preview.jpg");
                 
             try {
                 image = ImageIO.read(preview.toFile());
diff --git a/GUI/src/main/java/cz/fidentis/analyst/project/ModelsTableModel.java b/GUI/src/main/java/cz/fidentis/analyst/project/ModelsTableModel.java
index 8c76e899b637d4c0b361397162a1ff8fb10c311a..980ca3270b0a90925c9c2df2aac3448d4b1f0f2f 100644
--- a/GUI/src/main/java/cz/fidentis/analyst/project/ModelsTableModel.java
+++ b/GUI/src/main/java/cz/fidentis/analyst/project/ModelsTableModel.java
@@ -61,7 +61,7 @@ public class ModelsTableModel extends DefaultTableModel {
     /**
      * Adds new row to model
      * @param name String name of the face
-     * @param hasKD Boolean if face has KD tree calculated
+     * @param Path path to preview (if null than default preview is set)
      */
     public void addRowWithName(String name, Path path) {
         if (!path.toFile().exists()) {
diff --git a/GUI/src/main/java/cz/fidentis/analyst/project/ProjectPanel.java b/GUI/src/main/java/cz/fidentis/analyst/project/ProjectPanel.java
index 38af8f990ce24780780c2bbb2a5eb2308525af3b..8815d6b98e4b2bd72c9808ec29131d72c2f7ec11 100644
--- a/GUI/src/main/java/cz/fidentis/analyst/project/ProjectPanel.java
+++ b/GUI/src/main/java/cz/fidentis/analyst/project/ProjectPanel.java
@@ -519,9 +519,8 @@ public class ProjectPanel extends JPanel {
                                 path.toString().lastIndexOf('.'));
                 
                 if (project.addNewPath(path)) {  
-                    
-                    //Path preview = path.resolveSibling(name.concat("_preview_small.jpg"));
-                    Path preview = path.resolveSibling(name.concat("_preview.jpg"));
+
+                    Path preview = Paths.get(path.toString().split(".obj")[0] + "_preview.jpg");
                     model.addRowWithName(name, preview);
                     filterPanel.checkAllFacesLoaded(false);
 
@@ -712,9 +711,9 @@ public class ProjectPanel extends JPanel {
         }
         Collections.sort(names);
         names.forEach(name -> {
+            
             HumanFace face = project.getFaceByName(name);
-            String pathString = face.getPath();
-            Path preview = Paths.get(pathString.substring(0, pathString.lastIndexOf(".")).concat("_preview.jpg"));
+            Path preview = Paths.get(face.getPath().split(".obj")[0] + "_preview.jpg");
             model.addRowWithName(name, preview);
         });