Fixes AI being carded issue

Yep thats it
Fixes #1862
Fixes #2271