Fixes #882