Fixing TOOLS-1957