[openFATE 306650] Improve on osc