Fixes #819