Minor modification for AirVantage