diff --git a/CMakeLists.txt b/CMakeLists.txt
index 00e058c..f3f5b7c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -296,7 +296,7 @@ if (SQLITECPP_BUILD_TESTS)
 
     # Add definitions to keep googletest from making the compilation fail
     if (MSVC)
-        if (MSVC AND MSVC_VERSION GREATER_EQUAL 1910 AND MSVC_VERSION LESS_EQUAL 1919) # OR MSVC_TOOLSET_VERSION EQUAL 141)
+        if (MSVC_VERSION GREATER_EQUAL 1910 AND MSVC_VERSION LESS_EQUAL 1919) # OR MSVC_TOOLSET_VERSION EQUAL 141)
             target_compile_definitions(gtest PUBLIC _SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING)
             target_compile_definitions(gtest_main PUBLIC _SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING)
             target_compile_definitions(gmock PUBLIC _SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING)
diff --git a/build.bat b/build.bat
index 159db37..1989177 100644
--- a/build.bat
+++ b/build.bat
@@ -17,9 +17,9 @@ if ERRORLEVEL 1 goto onError
 ctest --output-on-failure
 if ERRORLEVEL 1 goto onError
 
-cd ..
-exit
+goto onSuccess
 
 :onError
 @echo An error occured!
-cd ..
\ No newline at end of file
+:onSuccess
+cd ..