fixed decoding