Fix CME on respawn