Fixes #167
Fixes #166