Decoder bug fix