fixes #819