Fixed compatibility with EE (?)