diff --git a/utility.hpp b/utility.hpp
index 2c0e7cf..b6420b2 100644
--- a/utility.hpp
+++ b/utility.hpp
@@ -145,7 +145,8 @@ namespace SimpleWeb {
           name_end_pos = std::string::npos;
           value_pos = std::string::npos;
         }
-        else if(query_string[c] == '=') {
+        else if(query_string[c] == '=' && 
+                name_end_pos == std::string::npos) {
           name_end_pos = c;
           value_pos = c + 1;
         }