Fixe the events models, again