Patch for an Issue #3