Update events (fixes #651)