Patch for OpManager sync issue