for cmo fields fix