fixed broken validations