Fix for issue #696
Merge pull request #1213 from ehogan/fix-issue-696

Fix for issue #696