Added compatibility with EE 1.9+