Issue #652