fixing decoding issue