Fixed everything Validator broke