Update patch for @VenVen's changes