Updated decoder bug fix