Fixed event.update

@znja: Please review and merge (and delete branch)