Fixing TOOLS-2448