fix ordering for AQS