diff --git a/src/noggit/MapView.cpp b/src/noggit/MapView.cpp
index 2e6dd152..89b665e1 100755
--- a/src/noggit/MapView.cpp
+++ b/src/noggit/MapView.cpp
@@ -6215,54 +6215,47 @@ void MapView::ShowContextMenu(QPoint pos)
                 if (terrainMode != editing_mode::object && NOGGIT_CUR_ACTION)
                     return;
 
-                // verify this
-                NOGGIT_ACTION_MGR->beginAction(this, Noggit::ActionFlags::eOBJECTS_ADDED | Noggit::ActionFlags::eOBJECTS_REMOVED); // Noggit::ActionFlags::eOBJECTS_TRANSFORMED
-                // NOGGIT_ACTION_MGR->beginAction(this, Noggit::ActionFlags::eOBJECTS_TRANSFORMED);
-
                 if (!objectEditor->clipboardSize())
                     return;
 
+                // verify this
+                NOGGIT_ACTION_MGR->beginAction(this, Noggit::ActionFlags::eOBJECTS_ADDED | Noggit::ActionFlags::eOBJECTS_REMOVED); // Noggit::ActionFlags::eOBJECTS_TRANSFORMED
+
                 // get the model to replace by
                 auto replace_select = objectEditor->getClipboard().front();
-                auto replace_obj = std::get<selected_object_type>(replace_select);
-                // bool replace_is_wmo = replace_obj->which() == eWMO;
-                auto& replace_path = replace_obj->instance_model()->file_key().filepath();
+                auto replacement_obj = std::get<selected_object_type>(replace_select);
+                auto& replace_path = replacement_obj->instance_model()->file_key().filepath();
+
+                std::vector<SceneObject*> objects_to_delete;
 
                 // iterate selection (objects to replace)
-                for (auto& source_obj : _world->get_selected_objects())
+                std::vector<selected_object_type> selected_objects = _world->get_selected_objects();
+                for (SceneObject* old_obj : selected_objects)
                 {
-
-                        math::degrees::vec3 source_rot(math::degrees(0)._, math::degrees(0)._, math::degrees(0)._);
-                        source_rot = source_obj->dir;
-                        float source_scale = source_obj->scale;
-                        auto source_pos = source_obj->pos;
-
-                        if (source_obj->instance_model()->file_key().filepath() == replace_path)
+                        if (old_obj->instance_model()->file_key().filepath() == replace_path)
                             continue;
 
-                        // TODO : Test if this breaks if clipboard is empty
+                        math::degrees::vec3 source_rot(math::degrees(0)._, math::degrees(0)._, math::degrees(0)._);
+                        source_rot = old_obj->dir;
+                        float source_scale = old_obj->scale;
+                        glm::vec3 source_pos = old_obj->pos;
 
-                        if (replace_obj->which() == eWMO)
+                        // _world->deleteInstance(old_obj->uid);
+                        objects_to_delete.emplace_back(old_obj);
+
+                        if (replacement_obj->which() == eWMO)
                         {
-                            // if (!replace_is_wmo)
-                            //     continue;
-
-                            // auto replace_wmo = static_cast<WMOInstance*>(replace_obj);
-                            // auto source_wmo = static_cast<WMOInstance*>(source_obj);
+                            // auto replace_wmo = static_cast<WMOInstance*>(replacement_obj);
+                            // auto source_wmo = static_cast<WMOInstance*>(old_obj);
 
                             auto new_obj = _world->addWMOAndGetInstance(replace_path, source_pos, source_rot);
-                            // new_obj->wmo->wait_until_loaded();
-                            // new_obj->wmo->waitForChildrenLoaded();
+                            new_obj->wmo->wait_until_loaded();
+                            new_obj->wmo->waitForChildrenLoaded();
                             new_obj->recalcExtents();
-
-                            _world->deleteWMOInstance(source_obj->uid);
                         }
-                        else if (replace_obj->which() == eMODEL)
+                        else if (replacement_obj->which() == eMODEL)
                         {
-                            // if (replace_is_wmo)
-                            //     continue;
-
-                            // auto replace_m2 = static_cast<ModelInstance*>(replace_obj);
+                            // auto replace_m2 = static_cast<ModelInstance*>(replacement_obj);
                             // auto source_m2 = static_cast<ModelInstance*>(source_obj);
 
                             // Just swapping model
@@ -6272,7 +6265,6 @@ void MapView::ShowContextMenu(QPoint pos)
                             // source_m2->recalcExtents();
                             // _world->updateTilesEntry(entry, model_update::add);
                             
-
                             auto new_obj = _world->addM2AndGetInstance(replace_path
                                 , source_pos
                                 , source_scale
@@ -6280,16 +6272,21 @@ void MapView::ShowContextMenu(QPoint pos)
                                 , &_object_paste_params
                                 , true
                             );
-                            // new_obj->model->wait_until_loaded();
-                            // new_obj->model->waitForChildrenLoaded();
+                            new_obj->model->wait_until_loaded();
+                            new_obj->model->waitForChildrenLoaded();
                             new_obj->recalcExtents();
-
-                            _world->deleteModelInstance(source_obj->uid);
                         }
                 }
                 // can cause the usual crash of deleting models overlapping unloaded tiles.
-                // DeleteSelectedObjects();
+                // _world->delete_selected_models();
                 // NOGGIT_ACTION_MGR->beginAction(this, Noggit::ActionFlags::eOBJECTS_REMOVED);
+                
+                // this would also delete models that got skipped
+                // _world->delete_selected_models();
+
+                _world->deleteObjects(objects_to_delete);
+                _world->reset_selection();
+
                 NOGGIT_ACTION_MGR->endAction();
             });