Fix issues with non ascii characters