Merge pull request #6461 from kmitchel/Fix_AG_Error