Fix DecodeString