diff --git a/src/Mapper/DatabaseMapper.php b/src/Mapper/DatabaseMapper.php
index 3ad96752d..20c8987d6 100644
--- a/src/Mapper/DatabaseMapper.php
+++ b/src/Mapper/DatabaseMapper.php
@@ -120,7 +120,7 @@ public function queueUpdate($entity, Node $node, State $state): ContextCarrierIn
         $data = $this->fetchFields($entity);
 
         // in a future mapper must support solid states
-        $changes = array_udiff_assoc($data, $node->getData(), [static::class, 'compare']);
+        $changes = array_udiff_assoc($data, $state->getData(), [static::class, 'compare']);
         unset($changes[$this->primaryKey]);
 
         $changedColumns = $this->mapColumns($changes);
diff --git a/src/Relation/RefersTo.php b/src/Relation/RefersTo.php
index 3790082f9..526fc9584 100644
--- a/src/Relation/RefersTo.php
+++ b/src/Relation/RefersTo.php
@@ -64,9 +64,6 @@ public function queue(CC $store, $entity, Node $node, $related, $original): Comm
         // fastest way to identify the entity
         $pk = $this->orm->getSchema()->define($node->getRole(), Schema::PRIMARY_KEY);
 
-        //dump('<<<------------------');
-
-        // todo: BUG IS HERE
         $this->forwardContext(
             $rNode,
             $this->outerKey,
@@ -74,16 +71,6 @@ public function queue(CC $store, $entity, Node $node, $related, $original): Comm
             $node,
             $this->innerKey
         );
-//
-//        dump(
-//            [
-//                $rNode,
-//                $node,
-//                $update
-//            ]
-//        );
-//
-//        dump("-------------------->>>\n\n");
 
         // set where condition for update query
         $this->forwardScope(