oe 2.3 compatibility