AQE fetch fix