Fix for CRM-10206