Merge pull request #498 from micmac1/1907-fix-weak-md