Issue #842