FIx validation