fix AIR1 better