Fixes #274
Merge pull request #275 from mtoma/fix-issue-274

Fixes #274