-- fixed for CRM-12929