Compability with EE 1.13