fixed missing events