CMakeLists.txt fixed in step-54