Fixes #2219
Merge pull request #13 from ameily/issue-2219

Fixes #2219