--fixed for CRM-12148 and fixed formatting