Fix case dealing with Air