Fix Cm recovery