Fix for an Issue #650