Fix M7 oddity