Issue 663

For Issue #663