Fixing TOOLS-2578