Fix to long-string decoding