Better handling of unicode