Fixed encoding issue for UTF-8