Commited tool fix I forgot to commit