Fix for cm10.1