* Fixing TOOLS-2415.