Fix for CRM-12362