cm9 fix up