Fixes #245
Merge pull request #246 from mtoma/fix-issue-245

Fixes #245