EE compability fix