Resolved unicode issue and hopefully async issue