From 776b68b6cce018341e01cfd4c957d8893885256c Mon Sep 17 00:00:00 2001
From: Eran Hammer <eran@hueniverse.com>
Date: Tue, 27 Aug 2013 17:18:21 -0700
Subject: [PATCH] Fix order of events in _preview

---
 lib/response/generic.js |  8 ++++++--
 lib/response/stream.js  | 12 ++++++++----
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/lib/response/generic.js b/lib/response/generic.js
index 2ba533207..6023ac077 100755
--- a/lib/response/generic.js
+++ b/lib/response/generic.js
@@ -189,9 +189,13 @@ internals.Generic.prototype._transmit = function (request, callback) {
             }
         }
 
+        self._preview.on('finish', function () {
+
+            self._preview.removeAllListeners();
+            end();
+        });
+
         self._preview.end();
-        self._preview.removeAllListeners();
-        end();
     };
 
     prepare();
diff --git a/lib/response/stream.js b/lib/response/stream.js
index 4721c22a3..de591ab6f 100755
--- a/lib/response/stream.js
+++ b/lib/response/stream.js
@@ -164,15 +164,19 @@ internals.Stream.prototype._transmit = function (request, callback) {
                 request.raw.res.end();
             }
 
+            self._preview.on('finish', function () {
+
+                self._preview.removeAllListeners();
+                self._stream.removeAllListeners();
+
+                callback();
+            });
+
             self._preview.end();
-            self._preview.removeAllListeners();
-            self._stream.removeAllListeners();
 
             if (self._stream.destroy) {
                 self._stream.destroy();
             }
-
-            callback();
         }
     };