Rewrite oc handle #32