Fix validation of initial model