diff --git a/.gitignore b/.gitignore
index 39821c1..f821c6c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -36,3 +36,5 @@
 *build*
 .vscode
 .cache
+/.vs
+/CMakeSettings.json
diff --git a/ormpp/utility.hpp b/ormpp/utility.hpp
index 88aea59..dd09e3e 100644
--- a/ormpp/utility.hpp
+++ b/ormpp/utility.hpp
@@ -451,7 +451,7 @@ inline void get_sql_conditions(std::string &sql, const std::string &arg,
       auto pos = sql.find("where");
       sql = sql.substr(0, pos);
     }
-    if (arg.find("limit") != std::string::npos) {
+    if (temp.find("limit") != std::string::npos) {
       auto pos = sql.find("where");
       sql = sql.substr(0, pos);
     }
diff --git a/tests/test_ormpp.cpp b/tests/test_ormpp.cpp
index db31d9a..d99f66a 100644
--- a/tests/test_ormpp.cpp
+++ b/tests/test_ormpp.cpp
@@ -1392,6 +1392,8 @@ TEST_CASE("query_s delete_records_s") {
     auto vec5 = sqlite.query_s<person>("name=? and age=?", "purecpp", 200);
     auto vec6 =
         sqlite.query_s<person>("select * from person where name=?", "purecpp");
+    auto vec11 =
+        sqlite.query_s<person>("SELECT * FROM PERSON WHERE NAME=?", "purecpp");
     auto vec7 = sqlite.query_s<person>("name=?", "purecpp' or '1=1");
     sqlite.delete_records_s<person>("name=?", "purecpp' or '1=1");
     auto vec8 = sqlite.query_s<person>();
@@ -1415,6 +1417,7 @@ TEST_CASE("query_s delete_records_s") {
     CHECK(vec8.size() == 2);
     CHECK(vec9.size() == 1);
     CHECK(vec10.size() == 0);
+    CHECK(vec11.front().age == 200);
   }
 #endif
 }