Validation more strict