Bug #1300

- Encode/decode pairing is now properly balanced.