Aoe auto-deviation