Build tool fix, works now