Fix to accept non ascii chars