From aed09d6d4a2f10539d9ff7ae39266ff31ebcf7c4 Mon Sep 17 00:00:00 2001
From: Yanick Witschi <yanick.witschi@terminal42.ch>
Date: Wed, 15 Feb 2023 14:09:35 +0100
Subject: [PATCH] The session storage identifier also needs access to the form
 fields

---
 src/FormManager.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/FormManager.php b/src/FormManager.php
index ec35415..3988044 100644
--- a/src/FormManager.php
+++ b/src/FormManager.php
@@ -378,6 +378,7 @@ private function prepare(): void
         }
 
         $this->formModel = $formModel;
+        $this->loadFormFieldModels();
 
         // Set current session reference from request or generate a new one
         $this->initSessionReference();
@@ -385,8 +386,6 @@ private function prepare(): void
         // Set storage identifier for storage implementations to work with
         $this->storageIdentifier = $this->storageIdentifierGenerator->generate($this);
 
-        $this->loadFormFieldModels();
-
         if (0 === \count($this->formFieldModels)) {
             $this->isValidFormFieldCombination = false;
             $this->prepared = true;