Airwire bug fix