Better support non-ASCII input