Fix for Sugar CRM