added compatibility for EE 2.8