Fix event flow