Fixing TOOLS-2359.