Fixing TOOLS-2532