Another attempt at getting the build to work