diff --git a/Client/Filesystem/HashFilesystem.go b/Client/Filesystem/HashFilesystem.go
index bca43c7..99f937b 100644
--- a/Client/Filesystem/HashFilesystem.go
+++ b/Client/Filesystem/HashFilesystem.go
@@ -144,14 +144,19 @@ func GetFilesystemDiff() (map[int]string, map[int]string, error) {
 		return dirtyFiles, newFiles, e
 	}
 
-	counter = len(dirtyFiles)
-
 	for _, file := range dirtyFiles {
 		_, ok = newFilesTmp[file]
-		if !ok {
-			newFiles[counter] = file
+		if ok {
+			delete(newFilesTmp, file)
 		}
 	}
 
+	counter = len(dirtyFiles)
+
+	for _, file := range newFilesTmp {
+		newFiles[counter] = file
+		counter++
+	}
+
 	return dirtyFiles, newFiles, e
 }
diff --git a/Client/Package/CreatePackage.go b/Client/Package/CreatePackage.go
index 27e3c2c..26e49b3 100644
--- a/Client/Package/CreatePackage.go
+++ b/Client/Package/CreatePackage.go
@@ -79,7 +79,7 @@ func CreatePackage() error {
 			}
 			filePath, ok = dirtyFiles[index]
 			if !ok {
-				filePath, ok = dirtyFiles[index]
+				filePath, ok = newFiles[index]
 				if !ok {
 					return errors.New("Invalid package selection")
 				}