Fix issue #2200
Merge pull request #2201 from rarila/issue-2200

Fix issue #2200