Fix tool (8/15)

Fix tool