diff --git a/src/main/java/net/lingala/zip4j/tasks/RenameFilesTask.java b/src/main/java/net/lingala/zip4j/tasks/RenameFilesTask.java
index 179d9c9..05402e4 100644
--- a/src/main/java/net/lingala/zip4j/tasks/RenameFilesTask.java
+++ b/src/main/java/net/lingala/zip4j/tasks/RenameFilesTask.java
@@ -125,9 +125,11 @@ private Map.Entry<String, String> getCorrespondingEntryFromMap(FileHeader fileHe
       String> fileNamesMap) {
 
     for (Map.Entry<String, String> fileHeaderToBeRenamed : fileNamesMap.entrySet()) {
-      if (fileHeaderToBeChecked.getFileName().startsWith(fileHeaderToBeRenamed.getKey())) {
-        return fileHeaderToBeRenamed;
-      }
+        if (fileHeaderToBeRenamed.getKey().endsWith(InternalZipConstants.ZIP_FILE_SEPARATOR) && fileHeaderToBeChecked.getFileName().startsWith(fileHeaderToBeRenamed.getKey())) {
+        	return fileHeaderToBeRenamed;
+        } else if (fileHeaderToBeChecked.getFileName().equals(fileHeaderToBeRenamed.getKey())) {
+        	return fileHeaderToBeRenamed;
+        }
     }
 
     return null;