Bugfix Validators