UTF-8 Issue fixed up