Patch for an Issue #564