Fix CME on disable