diff --git a/Client/Filesystem/FilesystemDiff.go b/Client/Filesystem/FilesystemDiff.go
index 9680d24..5908208 100644
--- a/Client/Filesystem/FilesystemDiff.go
+++ b/Client/Filesystem/FilesystemDiff.go
@@ -116,16 +116,17 @@ func (fsStatus *FilesystemStatus) parseFile(indexBucket, picksBucket *bolt.Bucke
 
 	defer func() {
 		bar.Increment()
+		fsStatusWG.Done()
 	}()
 
+	fsStatusWG.Wait()
+	fsStatusWG.Add(1)
+
 	pick = picksBucket.Get([]byte(p))
 	known = indexBucket.Get([]byte(p))
 
 	if pick != nil {
-		fsStatusWG.Wait()
-		fsStatusWG.Add(1)
 		fsStatus.PickedFiles = append(fsStatus.PickedFiles, p)
-		fsStatusWG.Done()
 		return
 	}
 
@@ -142,10 +143,7 @@ func (fsStatus *FilesystemStatus) parseFile(indexBucket, picksBucket *bolt.Bucke
 
 		e = newFileObject.IsDifferent(knownFileObject)
 		if e != nil {
-			fsStatusWG.Wait()
-			fsStatusWG.Add(1)
 			fsStatus.ModifiedFiles = append(fsStatus.ModifiedFiles, p)
-			fsStatusWG.Done()
 		}
 
 		return