Fix event model