Tools bugfix