Merge pull request #1689 from aparcar/asu-fixup