support for EE v2.6.1