Merge pull request #750 from mayeut/issue-729-2