Merge pull request #599 from micmac1/dahto-fix-patch