Fixes #151
Fixes #150