Quick fix to decoding issue