Fixed build from clean