Issue #850