Added fix on CMake