fixup: restrict to M8