Fix for an Issue #638