diff --git a/src/QueryParser.h b/src/QueryParser.h
index 457bd02..9c04d37 100644
--- a/src/QueryParser.h
+++ b/src/QueryParser.h
@@ -59,7 +59,7 @@ namespace uWS {
                         int out = 0;
 
                         /* Walk over all chars until end or null char, decoding in place */
-                        for (int i = 0; in[i] && i < statementValue.length(); i++) {
+                        for (int i = 0; i < statementValue.length() && in[i]; i++) {
                                 /* Only bother with '%' */
                                 if (in[i] == '%') {
                                     /* Do we have enough data for two bytes hex? */