Validation quickfix