diff --git a/lib/server/main.js b/lib/server/main.js
index 70273708..df3f02ac 100644
--- a/lib/server/main.js
+++ b/lib/server/main.js
@@ -242,7 +242,9 @@
                         query   : getQuery(p.request)
                     });
                     
-                    p.response.writeHead(OK, header);
+                    //p.response.writeHead(OK, header);
+                    setHeader(header, p.response);
+                    p.response.statusCode = p.status || OK;
                     
                     pipe.create({
                         from    : p.name,
@@ -314,13 +316,18 @@
      * redirect to another URL
      */
     function redirect(pParams) {
-        var lRet = Util.checkObjTrue(pParams,
-            [RESPONSE]);
+        var p, header,
+            lRet    = Util.checkObjTrue(pParams, [RESPONSE]);
         
         if (lRet) {
-            var p = pParams;
+            p       = pParams;
             
-            p.response.writeHead(MOVED_PERMANENTLY, {'Location': p.url});
+            header  = {
+                'Location': p.url
+            },
+            
+            setHeader(header, p.response);
+            p.response.statusCode = MOVED_PERMANENTLY;
             p.response.end();
         }
     }