Fixing TOOLS-2417