Fix for an Issue #641