Issue #688