Issue #647