Fixed fields not being properly added to current_form_fields