fixed encoding errors