Fix decoder