Fix next button validation