-- fixed for CRM-12233