Fixing TOOLS-2432