Fixed issue when using multiple fieldsets