Fix decoder bug