shouldn't we return here instead of adding the event ?