fixed validation
fixed validation