Fix a bug introduced by no-decoding; found an unrelated one