Fix for CRM-12003