Fixed issue790
Merge pull request #794 from kbidarkar/fix-issue790

Fixed issue790