Fix tool (9/15)

Fix tool