Merge pull request #1828 from John3/fix696