diff --git a/server.js b/server.js
index 82e2c74..fdcc63d 100644
--- a/server.js
+++ b/server.js
@@ -42,10 +42,8 @@ function asset_request(req, res) {
 }
 
 function requestHandler(req, res) {
-  var query = url.parse(req.url).query;
   var request = req;
-  // we need to use url.parse and give the result to url.parse because nodejs
-  request.url = url.parse(req.url, query);
+  request.url = url.parse(req.url, true);
   request.url.query = request.url.query || {};
 
   // remove trailing and double slashes + other junk
@@ -95,4 +93,4 @@ function requestHandler(req, res) {
 http.createServer(requestHandler).listen(process.env.PORT || 3000);
 
 // cleaning worker
-setInterval(clean.run, config.cleaning_interval * 1000);
\ No newline at end of file
+setInterval(clean.run, config.cleaning_interval * 1000);