Fixed issues with non ascii chars