Fix events in states