Issue #844