Fix for --rebuild
build