Encoding issues resolved