Adding fix for non-ascii characters.