Fixing TOOLS-2577