fixed encoding problems