fix create & validation