Update and patch for an Issue #2