Fix AO order issue.