Fixes #898
Fixes #900