Fix bug with disabling of some AA controls