Finally fixing a clean build