Fix wonky event adding behavior