Fixed #833
Merge pull request #841 from ostcar/issue-833

Issue 833