Fixing TOOLS-2390