Fixed updating of events