Issue #638