Fix validate issue