Bugfix Validations