Fix for decoding part of issue #74