Merge pull request #793 from jimfcarroll/fix-12580