Fix for new build system