Finally fixed encoding issues