diff --git a/core_commit.txt b/core_commit.txt
index 116e3f0b7..3d9ece5e9 100644
--- a/core_commit.txt
+++ b/core_commit.txt
@@ -1 +1 @@
-a35785438ebee68eb9d2544d671769a318182687
+07a3c272a42ce0fe834a645176d663ce3b193e49
diff --git a/go/cmd/nekoray_core/grpc_ray.go b/go/cmd/nekoray_core/grpc_ray.go
index 1cd12ca8b..9f89ec741 100644
--- a/go/cmd/nekoray_core/grpc_ray.go
+++ b/go/cmd/nekoray_core/grpc_ray.go
@@ -17,6 +17,7 @@ import (
 	"time"
 
 	"github.com/sirupsen/logrus"
+	core "github.com/v2fly/v2ray-core/v5"
 )
 
 type server struct {
@@ -212,12 +213,10 @@ func (s *server) Test(ctx context.Context, in *gen.TestReq) (out *gen.TestResp,
 			result := make(chan string, 0)
 
 			go func() {
-				stunServer := "206.53.159.130:3478"
-				stunAddr, _ := net.ResolveUDPAddr("udp4", stunServer)
-				pc, err := i.DialUDP(stunAddr)
+				pc, err := core.DialUDP(context.TODO(), i.Core)
 				if err == nil {
 					stunClient := stun.NewClientWithConnection(pc)
-					stunClient.SetServerAddr(stunServer)
+					stunClient.SetServerAddr("stun.ekiga.net:3478")
 					nat, host, err, fake := stunClient.Discover()
 					if err == nil {
 						if host != nil {
diff --git a/matsuri_commit.txt b/matsuri_commit.txt
index 3a4dd4196..bc8fb8b3d 100644
--- a/matsuri_commit.txt
+++ b/matsuri_commit.txt
@@ -1 +1 @@
-2e5069a2aa17e4aa5cb3ac4d87bc155f0afb2f09
+82662c5ec8266d42513454965f09516e40e6d495
diff --git a/ui/edit/edit_custom.cpp b/ui/edit/edit_custom.cpp
index e0dbb9b96..1fed9c8b9 100644
--- a/ui/edit/edit_custom.cpp
+++ b/ui/edit/edit_custom.cpp
@@ -102,6 +102,9 @@ void EditCustom::onStart(QSharedPointer<NekoRay::ProxyEntity> _ent) {
         auto tmpEnt = NekoRay::ProfileManager::NewProxyEntity("custom");
         auto bean = tmpEnt->CustomBean();
         SAVE_CUSTOM_BEAN
+        // 补充
+        bean->serverAddress = get_edit_text_serverAddress();
+        bean->serverPort = get_edit_text_serverPort().toInt();
         if (bean->core.isEmpty()) return;
         //
         auto result = NekoRay::BuildConfig(tmpEnt, false, false);