Build tool fix