fixed 822
Merge pull request #823 from jamilatta/bug822

Bug 822