Encoding Issues fix