Fixes #2355
Merge pull request #4025 from nightexcessive/bugfix/ai-apc

Fixes #2355