invert EF order + osc mess fix