Conditional field validation fix