EE 2.8 compatability