diff --git a/utils.py b/utils.py
index cc05d24..908e0c7 100644
--- a/utils.py
+++ b/utils.py
@@ -55,7 +55,7 @@ def get_sha256(file_path: str) -> str:
 Based on a embedding name, eg: EasyNegative, finds the path as known in comfy, including extension
 """
 def full_embedding_path_for(embedding: str) -> Optional[str]:
-    matching_embedding = next((x for x in folder_paths.get_filename_list("embeddings") if x.startswith(embedding)), None)
+    matching_embedding = next((x for x in folder_paths.get_filename_list("embeddings") if Path(x).with_suffix('') == Path(embedding)), None)
     if matching_embedding == None:
         return None
     return folder_paths.get_full_path("embeddings", matching_embedding)
@@ -70,7 +70,7 @@ def full_lora_path_for(lora: str) -> Optional[str]:
         lora += ".safetensors"
 
     # Find the matching lora path
-    matching_lora = next((x for x in folder_paths.get_filename_list("loras") if x.endswith(lora)), None)
+    matching_lora = next((x for x in folder_paths.get_filename_list("loras") if Path(x).name == lora), None)
     if matching_lora is None:
         print(f'ComfyUI-Image-Saver: could not find full path to lora "{lora}"')
         return None
@@ -86,11 +86,11 @@ def full_checkpoint_path_for(model_name: str) -> str:
     if extension.lower() not in supported_extensions:
         model_name += ".safetensors"
 
-    matching_checkpoint = next((x for x in folder_paths.get_filename_list("checkpoints") if x.endswith(model_name)), None)
+    matching_checkpoint = next((x for x in folder_paths.get_filename_list("checkpoints") if Path(x) == Path(model_name)), None)
     if matching_checkpoint:
         return folder_paths.get_full_path("checkpoints", matching_checkpoint)
 
-    matching_model = next((x for x in folder_paths.get_filename_list("diffusion_models") if x.endswith(model_name)), None)
+    matching_model = next((x for x in folder_paths.get_filename_list("diffusion_models") if Path(x) == Path(model_name)), None)
     if matching_model:
         return folder_paths.get_full_path("diffusion_models", matching_model)