Fixed bugs in OCC and P_OCC
Fixed bugs in OCC and P_OCC