Fix: validation