EE 2.8 compat