- fixed encoding issues