Manual patch for compatibility