diff --git a/worker.js b/worker.js
index e4168a7..d0ee3d0 100644
--- a/worker.js
+++ b/worker.js
@@ -7,7 +7,7 @@ var WorkerTask = require('./task-worker');
 var ClientTask = require('./task-client');
 var emptyFunction = require('emptyfunction');
 
-exports.__construct = function (init) {
+exports.__construct = function (init) {	
     this._workers = {};
     this._workersCount = 0;
 
@@ -212,10 +212,10 @@ Worker.dispatchWorker = function (job,socket) {
         });
 
         task.writer.once('end', function () {
+            self.endWork(jobid);
             if (socket.connected) {
                 socket.workComplete(jobid,task.lastChunk);
             }
-            self.endWork(jobid);
         });
     }
     else {
@@ -229,14 +229,14 @@ Worker.dispatchWorker = function (job,socket) {
         });
 
         task.writer.once('end', function () {
+            self.endWork(jobid);
             if (socket.connected) {
                 if (task.lastChunk) addToBuffer(task.lastChunk);
                 socket.workComplete(jobid,buffer);
             }
-            self.endWork(jobid);
         });
     }
-    
+
     try {
         var handleReturnValue = function (value) {
             if (value && value.pipe) {