Fixes #883