Bugfix form fields