Patch for fr/native