diff --git a/.gitignore b/.gitignore
index b176abe12..e4e8d7bd9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -35,7 +35,7 @@ build
 crow_all.h
 
 # conan.io
-build/
+build*/
 
 #Doxygen
 html/
diff --git a/include/crow/http_server.h b/include/crow/http_server.h
index 63e3646d1..7bce24148 100644
--- a/include/crow/http_server.h
+++ b/include/crow/http_server.h
@@ -31,7 +31,7 @@ namespace crow
             signals_(io_service_, SIGINT, SIGTERM),
             tick_timer_(io_service_),
             handler_(handler),
-            concurrency_(concurrency),
+            concurrency_(concurrency == 0 ? 1 : concurrency),
             port_(port),
             bindaddr_(bindaddr),
             middlewares_(middlewares),