Fix for form validation