Adaption to of_0073