Fixed Encoding issues