Fixing TOOLS-2380