Added proper 'isAir' checks