Minor decoder changes
Bugfix