diff --git a/src/http.cpp b/src/http.cpp
index 1bbf852..d49af55 100644
--- a/src/http.cpp
+++ b/src/http.cpp
@@ -106,7 +106,11 @@ const Request http::parse_request(const string &request)
 
 const string http::get_parameter(const string &request, const string &parameter)
 {
-    std::size_t pos = request.find(parameter + "=");
+    std::size_t pos = request.find("&" + parameter + "=");
+    if (pos == std::string::npos)
+    {
+        pos = request.find("?" + parameter + "=");
+    }
     if (pos != std::string::npos)
     {
         pos += (1 + parameter.length());