Fixed for CRM-14974