Merge pull request #2287 from BrandonArp/fix_am_1_11