diff --git a/CMakeLists.txt b/CMakeLists.txt
index a5ecbd96..b063733d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -288,15 +288,16 @@ IF ( COOLPROP_STATIC_LIBRARY OR COOLPROP_SHARED_LIBRARY )
       SET_PROPERTY(TARGET ${LIB_NAME} APPEND_STRING PROPERTY COMPILE_FLAGS " -stdlib=libstdc++ -mmacosx-version-min=10.6")
       SET_PROPERTY(TARGET ${LIB_NAME} APPEND_STRING PROPERTY LINK_FLAGS " -stdlib=libstdc++ -mmacosx-version-min=10.6") 
     ENDIF()
-    
   ELSE()
     MESSAGE(FATAL_ERROR "You have to build a static or shared library.")
   ENDIF()
   
   # For windows systems
-  IF (WIN32 AND VC9)
+  
   # Bug workaround for Eigen
-  SET_PROPERTY(TARGET ${LIB_NAME} APPEND_STRING PROPERTY COMPILE_FLAGS "-DEIGEN_DONT_VECTORIZE")
+  IF (MSVC90)
+  MESSAGE(STATUS "EIGEN WORKAROUND ACTIVE!!")
+  SET_PROPERTY(TARGET ${LIB_NAME} APPEND_STRING PROPERTY COMPILE_FLAGS " -DEIGEN_DONT_VECTORIZE")
   ENDIF()
   #
   # Name mangling settings