Issue #663