Fix for an Issue #640