Fixed adding events