That's indeed correct we did not added `control' in `correct_mismatch' because this is a value that doesn't need to be persisted so the value is irrelevant. But we certainly overlooked the invariant.

So I recommend that in your local version of `correct_mismatch' you set `control' to `0'. This will be thus fixed in the next revision.

Do you need the fix also for the compatible mode?