diff --git a/sources/TerminalStrip/UndoCommand/groupterminalscommand.cpp b/sources/TerminalStrip/UndoCommand/groupterminalscommand.cpp
index 3ddb621e4..e3a74d0bf 100644
--- a/sources/TerminalStrip/UndoCommand/groupterminalscommand.cpp
+++ b/sources/TerminalStrip/UndoCommand/groupterminalscommand.cpp
@@ -16,7 +16,6 @@
 		along with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include "groupterminalscommand.h"
-#include "../../utils/qetutils.h"
 #include "../physicalterminal.h"
 
 /**
diff --git a/sources/TerminalStrip/UndoCommand/sortterminalstripcommand.cpp b/sources/TerminalStrip/UndoCommand/sortterminalstripcommand.cpp
index 6ce4a0862..50eb4ff45 100644
--- a/sources/TerminalStrip/UndoCommand/sortterminalstripcommand.cpp
+++ b/sources/TerminalStrip/UndoCommand/sortterminalstripcommand.cpp
@@ -19,7 +19,6 @@
 #include "../terminalstrip.h"
 #include "../physicalterminal.h"
 #include "../realterminal.h"
-#include "../../utils/qetutils.h"
 
 SortTerminalStripCommand::SortTerminalStripCommand(TerminalStrip *strip, QUndoCommand *parent) :
 	QUndoCommand(parent),
diff --git a/sources/TerminalStrip/ui/terminalstripeditor.cpp b/sources/TerminalStrip/ui/terminalstripeditor.cpp
index c8afaf339..7de7b958f 100644
--- a/sources/TerminalStrip/ui/terminalstripeditor.cpp
+++ b/sources/TerminalStrip/ui/terminalstripeditor.cpp
@@ -34,7 +34,6 @@
 #include "../UndoCommand/groupterminalscommand.h"
 #include "../UndoCommand/changeterminallevel.h"
 #include "../UndoCommand/bridgeterminalscommand.h"
-#include "../../utils/qetutils.h"
 #include "../physicalterminal.h"
 #include "../realterminal.h"
 #include "../terminalstripbridge.h"
@@ -683,13 +682,13 @@ void TerminalStripEditor::on_m_group_terminals_pb_clicked()
 		{
 			auto receiver_ = m_current_strip->physicalTerminal(mrtd_vector.takeFirst().real_terminal);
 
-			QVector<QWeakPointer<RealTerminal>> vector_;
+			QVector<QSharedPointer<RealTerminal>> vector_;
 			for (const auto & mrtd : mrtd_vector) {
-				vector_.append(mrtd.real_terminal);
+				vector_.append(mrtd.real_terminal.toStrongRef());
 			}
 			m_project->undoStack()->push(new GroupTerminalsCommand(m_current_strip,
 																   receiver_,
-																   QETUtils::weakVectorToShared(vector_)));
+																   vector_));
 		}
 	}
 }
@@ -703,12 +702,11 @@ void TerminalStripEditor::on_m_ungroup_pb_clicked()
 	{
 		const auto mrtd_vector = m_model->modelRealTerminalDataForIndex(ui->m_table_widget->selectionModel()->selectedIndexes());
 
-		QVector<QWeakPointer<RealTerminal>> vector_;
+		QVector<QSharedPointer<RealTerminal>> vector_;
 		for (const auto &mrtd : mrtd_vector) {
-			vector_.append(mrtd.real_terminal);
+			vector_.append(mrtd.real_terminal.toStrongRef());
 		}
-		m_project->undoStack()->push(new UnGroupTerminalsCommand(m_current_strip,
-																 QETUtils::weakVectorToShared(vector_)));
+		m_project->undoStack()->push(new UnGroupTerminalsCommand(m_current_strip,vector_));
 	}
 }