Fix tool (7/15)

Fix tool