fix bug with form fields
fix bug with form fields