Further attempt to fix the build