unicode fixes
line fix
Merge pull request #3171 from abdoosh00/unicode-fixes

unicode fixes