Custom Build Tool correction