Fix for CRM-15850