Fix for CRM-19873