fix for eventdata object