diff --git a/src/gbproxy/gb_proxy.c b/src/gbproxy/gb_proxy.c
index db7f55b..bd58617 100644
--- a/src/gbproxy/gb_proxy.c
+++ b/src/gbproxy/gb_proxy.c
@@ -1114,9 +1114,7 @@
 				LOGP(DGPRS, LOGL_NOTICE, "Peer for BVCI=%u moved from NSEI=%u to NSEI=%u\n", bvci, nse_old->nsei, nsei);
 
 				/* Move peer to different NSE */
-				llist_del(&from_peer->list);
-				llist_add(&from_peer->list, &nse_new->bts_peers);
-				from_peer->nse = nse_new;
+				gbproxy_peer_move(from_peer, nse_new);
 			}
 
 			if (TLVP_PRESENT(&tp, BSSGP_IE_CELL_ID)) {
diff --git a/src/gbproxy/gb_proxy_peer.c b/src/gbproxy/gb_proxy_peer.c
index 920547c..62c4d94 100644
--- a/src/gbproxy/gb_proxy_peer.c
+++ b/src/gbproxy/gb_proxy_peer.c
@@ -253,6 +253,13 @@
 	talloc_free(peer);
 }
 
+void gbproxy_peer_move(struct gbproxy_peer *peer, struct gbproxy_nse *nse)
+{
+	llist_del(&peer->list);
+	llist_add(&peer->list, &nse->bts_peers);
+	peer->nse = nse;
+}
+
 int gbproxy_cleanup_peers(struct gbproxy_config *cfg, uint16_t nsei, uint16_t bvci)
 {
 	int counter = 0;