Fixes #895