more paranoid decoder, with bugfix