Fix for CRM-12428