bugfix CMB