Fixed the bug with A&A