Fixed to work with EFL 1.8.x and greater