Fixed working with odd characters