History: fix EL with old implementation