conditional field validation fix