Fixing TOOLS-2404