Patch for oc 4.5.4