Fix for CRM-12004