Fix M-to-C transition