CRM Bug fix