Fixing TOOLs-346