Fix events. v1.35