Another attempt at fixing the build script