Fixes bug #834
Merge pull request #835 from ClemRz/bug-834

Fixes bug #834