client-side validation fix