Bugfixes decoding