Patch for an Issue #582