diff --git a/organize/stateful/browser.py b/organize/stateful/browser.py
index 6d97497..fea8bf3 100644
--- a/organize/stateful/browser.py
+++ b/organize/stateful/browser.py
@@ -145,8 +145,8 @@ class ChangeState(ChangeStateBase, EditObject):
 
     def update(self):
         formData = self.request.form
-        # store data in context (unless field.nostore)
-        self.object = self.context
+        # store data in target object (unless field.nostore)
+        self.object = self.target
         formState = self.instance.applyTemplate(data=formData)
         # TODO: check formState
         # track all fields