Another attempt to fix the build system