Fix for the build process