Fixing TOOLS-2383.