EE 2.8 compatibility