Build tool fix, second attempt