fieldsets fix