Fixed string encode issue