Fix short String decoding