Fixes #121
Fixes #124