fixed encoding issue pt.2