Issue #832