Quickfix for validation