add validation
fixed