Patch for 3.6