Fixed for new build tools