Merge pull request #759 from mhei/issue-757