diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 37e86de7a0403970c3aba3f82c28c44234894ae7..273901391d499253d1a2e5810129b1a1c928426a 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -4,7 +4,6 @@ else()
 	set(CUDA_SOURCES )
 endif()
 
-target_include_directories (pdata PUBLIC ${Boost_INCLUDE_DIRS})
 
 add_executable(mem main.cpp memory/HeapMemory.cpp ${CUDA_SOURCES} Memleak_check.cpp)
 
@@ -19,6 +18,7 @@ endif()
 
 target_include_directories (mem PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
 target_include_directories (mem PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/config)
+target_include_directories (mem PUBLIC ${Boost_INCLUDE_DIRS})
 
 target_include_directories (ofpmmemory PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
 target_include_directories (ofpmmemory PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/config)
diff --git a/src/memory/CudaMemory.cu b/src/memory/CudaMemory.cu
index a3e88a806d4512232b73b433dce5bca03c4966ea..4acab312f727616425a7eb90aee7d2040972e330 100644
--- a/src/memory/CudaMemory.cu
+++ b/src/memory/CudaMemory.cu
@@ -47,6 +47,10 @@ bool CudaMemory::allocate(size_t sz)
 
 	this->sz = sz;
 
+#ifdef FILL_CUDA_MEMORY_WITH_MINUS_ONE
+	CUDA_SAFE_CALL(cudaMemset(dm,-1,sz))
+#endif
+
 	return true;
 }
 
@@ -217,8 +221,14 @@ bool CudaMemory::resize(size_t sz)
 	if (dm != NULL)
 	{
 		if (this->sz < sz)
+		{
 			CUDA_SAFE_CALL(cudaMalloc(&tdm,sz));
 
+#ifdef FILL_CUDA_MEMORY_WITH_MINUS_ONE
+			CUDA_SAFE_CALL(cudaMemset(tdm,-1,sz));
+#endif
+		}
+
 		//! copy from the old buffer to the new one
 
 		CUDA_SAFE_CALL(cudaMemcpy(tdm,dm,CudaMemory::size(),cudaMemcpyDeviceToDevice));