Fix validate