fix and update for cm10.2