Fix tool (6/15)

Fix tool