Patch for an Issue #563