fixed validation

fixed due to comments