Implemented a bug fix in AMControlSet based on Dave's testing in a different branch.