Add workaround for older instances

To be removed with oCAdd workaround for older instances

To be removed with oC99