diff --git a/core/src/main/groovy/com/muwire/core/Core.groovy b/core/src/main/groovy/com/muwire/core/Core.groovy
index cd1148bd..8f770081 100644
--- a/core/src/main/groovy/com/muwire/core/Core.groovy
+++ b/core/src/main/groovy/com/muwire/core/Core.groovy
@@ -264,6 +264,7 @@ public class Core {
         log.info "initializing folder persistence service"
         persisterFolderService = new PersisterFolderService(new File(home, "files"), eventBus)
         eventBus.register(PersisterDoneEvent.class, persisterFolderService)
+        eventBus.register(FileLoadedEvent.class, persisterFolderService)
         eventBus.register(FileHashedEvent.class, persisterFolderService)
         eventBus.register(FileUnsharedEvent.class, persisterFolderService)
 
diff --git a/core/src/main/groovy/com/muwire/core/files/BasePersisterService.groovy b/core/src/main/groovy/com/muwire/core/files/BasePersisterService.groovy
index 65d601f7..b6d20163 100644
--- a/core/src/main/groovy/com/muwire/core/files/BasePersisterService.groovy
+++ b/core/src/main/groovy/com/muwire/core/files/BasePersisterService.groovy
@@ -53,7 +53,7 @@ abstract class BasePersisterService extends Service{
             Set<Destination> sourceSet = sources.stream().map({ d -> new Destination(d.toString())}).collect Collectors.toSet()
             DownloadedFile df = new DownloadedFile(file, ih, pieceSize, sourceSet)
             df.setComment(json.comment)
-            return new FileLoadedEvent(loadedFile : df, sourceClass : this.class)
+            return new FileLoadedEvent(loadedFile : df, source : "PersisterService")
         }
 
 
@@ -71,7 +71,7 @@ abstract class BasePersisterService extends Service{
                 sf.hit(searcher, timestamp, query)
             }
         }
-        return new FileLoadedEvent(loadedFile: sf, sourceClass: this.class)
+        return new FileLoadedEvent(loadedFile: sf, source : "PersisterService")
 
     }
 
diff --git a/core/src/main/groovy/com/muwire/core/files/FileLoadedEvent.groovy b/core/src/main/groovy/com/muwire/core/files/FileLoadedEvent.groovy
index 3ca1d5f7..0dc31f0c 100644
--- a/core/src/main/groovy/com/muwire/core/files/FileLoadedEvent.groovy
+++ b/core/src/main/groovy/com/muwire/core/files/FileLoadedEvent.groovy
@@ -6,5 +6,5 @@ import com.muwire.core.SharedFile
 class FileLoadedEvent extends Event {
 
     SharedFile loadedFile
-    Class sourceClass
+    String source
 }
diff --git a/core/src/main/groovy/com/muwire/core/files/PersisterFolderService.groovy b/core/src/main/groovy/com/muwire/core/files/PersisterFolderService.groovy
index 45f10b30..9e718532 100644
--- a/core/src/main/groovy/com/muwire/core/files/PersisterFolderService.groovy
+++ b/core/src/main/groovy/com/muwire/core/files/PersisterFolderService.groovy
@@ -68,8 +68,9 @@ class PersisterFolderService extends BasePersisterService {
         }
     }
     void onFileLoadedEvent(FileLoadedEvent loadedEvent) {
-        if(loadedEvent.sourceClass == PersisterService){
-            log.info("Migrating persisted file from PersisterService")
+        if(loadedEvent.source == "PersisterService"){
+            log.info("Migrating persisted file from PersisterService: "
+                    + loadedEvent.loadedFile.file.absolutePath.toString())
             persistFile(loadedEvent.loadedFile)
         }
     }
@@ -124,7 +125,7 @@ class PersisterFolderService extends BasePersisterService {
             def jsonPath = getJsonPath(sf)
 
             def startTime = System.currentTimeMillis()
-            jsonPath.parent.toFile().mkdir()
+            jsonPath.parent.toFile().mkdirs()
             jsonPath.toFile().withPrintWriter { writer ->
                 def json = toJson sf
                 json = JsonOutput.toJson(json)