fix decoding except for lists