Correct rare mismatch between the encoder and decoder introduced by e9b53212.

Only one of the two required checks in the encoder were updated. Thanks to
Tim for tracking down the actual cause of the mismatch.