diff --git a/src/Site/Site.py b/src/Site/Site.py
index 44f86eda..0382aa31 100644
--- a/src/Site/Site.py
+++ b/src/Site/Site.py
@@ -737,7 +737,7 @@ class Site(object):
                 gevent.spawn(self.announce)
                 if inner_path != "content.json":  # Prevent double download
                     task = self.worker_manager.addTask("content.json", peer)
-                    task.get()
+                    task["evt"].get()
                     self.content_manager.loadContent()
                     if not self.content_manager.contents.get("content.json"):
                         return False  # Content.json download failed
@@ -762,7 +762,7 @@ class Site(object):
 
             task = self.worker_manager.addTask(inner_path, peer, priority=priority)
             if blocking:
-                return task.get()
+                return task["evt"].get()
             else:
                 return task
 
diff --git a/src/Worker/WorkerManager.py b/src/Worker/WorkerManager.py
index 633e5e1f..c17903ba 100644
--- a/src/Worker/WorkerManager.py
+++ b/src/Worker/WorkerManager.py
@@ -424,7 +424,7 @@ class WorkerManager(object):
 
             if priority:
                 task["priority"] += priority  # Boost on priority
-            return task["evt"]
+            return task
         else:  # No task for that file yet
             evt = gevent.event.AsyncResult()
             if peer:
@@ -470,7 +470,7 @@ class WorkerManager(object):
 
             else:
                 self.startWorkers(peers)
-            return evt
+            return task
 
     # Find a task using inner_path
     def findTask(self, inner_path):