AOA: rebasing, yet again.