Fixes #915