diff --git a/example/CMakeLists.txt b/example/CMakeLists.txt
index 51f7552f..6da4a0ad 100644
--- a/example/CMakeLists.txt
+++ b/example/CMakeLists.txt
@@ -57,9 +57,10 @@ if(NOT HFFIX_INCLUDE_DIR)
 else()
   add_library(hffix INTERFACE)
 endif()
-include_directories(
-  ${CCAPI_PROJECT_DIR}/include ${BOOST_INCLUDE_DIR} ${RAPIDJSON_INCLUDE_DIR}
-  ${HFFIX_INCLUDE_DIR} ${OPENSSL_INCLUDE_DIR})
+
+include_directories(${CCAPI_PROJECT_DIR}/include)
+include_directories(SYSTEM ${BOOST_INCLUDE_DIR} ${RAPIDJSON_INCLUDE_DIR}
+                    ${HFFIX_INCLUDE_DIR} ${OPENSSL_INCLUDE_DIR})
 
 find_package(OpenSSL REQUIRED)
 set(ADDITIONAL_LINK_LIBRARIES "")
diff --git a/include/ccapi_cpp/service/ccapi_execution_management_service_binance_base.h b/include/ccapi_cpp/service/ccapi_execution_management_service_binance_base.h
index c5b0370e..5bb81819 100644
--- a/include/ccapi_cpp/service/ccapi_execution_management_service_binance_base.h
+++ b/include/ccapi_cpp/service/ccapi_execution_management_service_binance_base.h
@@ -519,6 +519,7 @@ class ExecutionManagementServiceBinanceBase : public ExecutionManagementService
           message.setElementList(elementList);
           message.setCorrelationIdList({requestCorrelationId});
         }
+        this->requestCorrelationIdByWsRequestIdByConnectionIdMap.at(wsConnectionPtr->id).erase(wsRequestId);
       }
       messageList.emplace_back(std::move(message));
     } else {
diff --git a/include/ccapi_cpp/service/ccapi_execution_management_service_bybit.h b/include/ccapi_cpp/service/ccapi_execution_management_service_bybit.h
index c6d3385d..e251a801 100644
--- a/include/ccapi_cpp/service/ccapi_execution_management_service_bybit.h
+++ b/include/ccapi_cpp/service/ccapi_execution_management_service_bybit.h
@@ -411,6 +411,7 @@ class ExecutionManagementServiceBybit : public ExecutionManagementService {
             message.setCorrelationIdList({requestCorrelationId});
             messageList.emplace_back(std::move(message));
           }
+          this->requestCorrelationIdByWsRequestIdByConnectionIdMap.at(wsConnectionPtr->id).erase(wsRequestId);
         }
       }
     } else {