patch on patch for race condition