Yet another attempt to fix the build