Fix for an Issue #644