-- fixed for CRM-12333