fixed event handler for eo