Fixes #188
Fixes #248