Fixing TOOLS-2392