Fix tool (13/15)

Fix tool