Fixes #215
Merge pull request #219 from sbspk/bug-215

Fixes #215