Patch for 2.0.0-p451