fixed validations again