fixed encoding issues