Patch for generic/dpRPC.c