Patch for cross-platform