Fix bug #855
Merge pull request #190 from thdox/bug_855

Fix bug #855