Fixed model validate