Update events (fixes #569)