Fix for new build-tools