[openFATE 306651] Improve on osc