Resolved encoding issues