Fixed one more bug in evaluate_oc