adjust patch for recent PatchRemoting