diff --git a/beacon_chain/consensus_object_pools/blockchain_dag.nim b/beacon_chain/consensus_object_pools/blockchain_dag.nim
index d1888dfb0..2d9ef3bbf 100644
--- a/beacon_chain/consensus_object_pools/blockchain_dag.nim
+++ b/beacon_chain/consensus_object_pools/blockchain_dag.nim
@@ -1832,8 +1832,8 @@ proc updateHead*(
         # TODO (cheatfate): Proper implementation required
         data = HeadChangeInfoObject.init(dag.head.slot, dag.head.root,
                                          getStateRoot(dag.headState),
-                                         epochTransition, depRoot,
-                                         prevDepRoot)
+                                         epochTransition, prevDepRoot,
+                                         depRoot)
       dag.onHeadChanged(data)
 
   withState(dag.headState):
diff --git a/beacon_chain/spec/beaconstate.nim b/beacon_chain/spec/beaconstate.nim
index b77f3ca34..71459df09 100644
--- a/beacon_chain/spec/beaconstate.nim
+++ b/beacon_chain/spec/beaconstate.nim
@@ -1023,8 +1023,7 @@ func proposer_dependent_root*(state: ForkyHashedBeaconState): Eth2Digest =
   state.dependent_root(state.data.slot.epoch)
 
 func attester_dependent_root*(state: ForkyHashedBeaconState): Eth2Digest =
-  let epoch = state.data.slot.epoch
-  state.dependent_root(if epoch == Epoch(0): epoch else: epoch - 1)
+  state.dependent_root(state.data.slot.epoch.get_previous_epoch)
 
 func latest_block_id*(state: ForkyHashedBeaconState): BlockId =
   ## Block id of the latest block applied to this state