Fix: validator