Merge pull request #751 from micmac1/mod-av-BROKEN