Fix on EE 2.8+

Close #1