fix(events): fixed event generation