fixes #206
Merge branch 'fix-206'