starred fix, oc images fix