Issue #661