Better touch tool fix