EE 2.6 compatibility