Fixed multiple  eventlisteners