diff --git a/cmake/compiler.cmake b/cmake/compiler.cmake
index ce738e14..ebf42d84 100644
--- a/cmake/compiler.cmake
+++ b/cmake/compiler.cmake
@@ -9,10 +9,18 @@ else()
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP")
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /bigobj")
 
-  # edit and continue
   if(CMAKE_BUILD_TYPE STREQUAL "Debug")
+    # disabling SAFESEH
+    message(STATUS "Disabling Safe Exception Handlers..")
+    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /SAFESEH:NO")
+
+    # edit and continue
     message(STATUS "Enabling Edit and Continue..")
-    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /INCREMENTAL /ZI")
+    add_definitions(/ZI)
+
+    # incremental linking
+    message(STATUS "Enabling Incremental Linking..")
+    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /INCREMENTAL")
   endif()
 endif()