Issue #840