From 2b39b4ac339b80312ae6f4a43e3727fac3354759 Mon Sep 17 00:00:00 2001
From: Arkadiusz Szczepkowicz <arek.szczepkowicz@ng-analytics.com>
Date: Wed, 18 Oct 2023 15:03:06 +0200
Subject: [PATCH] #1668: Move setPhase method call

---
 src/vt/vrt/collection/manager.impl.h | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/vt/vrt/collection/manager.impl.h b/src/vt/vrt/collection/manager.impl.h
index 4a4efa8ff1..65679531a3 100644
--- a/src/vt/vrt/collection/manager.impl.h
+++ b/src/vt/vrt/collection/manager.impl.h
@@ -1181,8 +1181,6 @@ bool CollectionManager::insertCollectionElement(
     elm_holder->insert(idx, typename Holder<IndexT>::InnerHolder{
       std::move(vc)
     });
-    auto raw_ptr = elm_holder->lookup(idx).getRawPtr();
-    raw_ptr->getLBData().setPhase(thePhase()->getCurrentPhase());
 
     if (is_migrated_in) {
       theLocMan()->getCollectionLM<IndexT>(proxy)->entityImmigrated(
@@ -1193,6 +1191,9 @@ bool CollectionManager::insertCollectionElement(
         listener::ElementEventEnum::ElementMigratedIn, idx, home_node
       );
     } else {
+      auto raw_ptr = elm_holder->lookup(idx).getRawPtr();
+      raw_ptr->getLBData().setPhase(thePhase()->getCurrentPhase());
+
       theLocMan()->getCollectionLM<IndexT>(proxy)->registerEntity(
         idx, home_node,
         CollectionManager::collectionMsgHandler<ColT, IndexT>
@@ -1683,10 +1684,6 @@ void CollectionManager::insert(
   if (insert_node == this_node and proceed_with_insertion) {
     auto cons_fn = detail::InsertMsgDispatcher<MsgT, ColT>::makeCons(insert_msg);
     makeCollectionElement<ColT>(untyped_proxy, idx, mapped_node, cons_fn);
-
-    auto elm_holder = findElmHolder<IndexType>(untyped_proxy);
-    auto raw_ptr = elm_holder->lookup(idx).getRawPtr();
-    raw_ptr->getLBData().updatePhase(thePhase()->getCurrentPhase());
   } else if (insert_node != this_node) {
     auto msg = makeMessage<InsertMsg<ColT, MsgT>>(
       proxy, idx, insert_node, mapped_node, modify_epoch, insert_msg