Fixed CMake