diff --git a/Makefile b/Makefile
index ccbd400..4ebc3b0 100644
--- a/Makefile
+++ b/Makefile
@@ -11,6 +11,7 @@ clean:
 	rm -rf $(FUNC_BOT)/vendor
 	rm -rf $(FUNC_BOT)/messaging
 	rm -rf pkg/mock
+	rm -rf pkg/wire/wire_gen.go
 
 prepare:
 	cd pkg \
@@ -18,14 +19,15 @@ prepare:
 		&& go install github.com/gotesttools/gotestfmt/v2/cmd/gotestfmt@latest \
 		&& go install github.com/google/wire/cmd/wire@latest
 
-generate: clean
+generate:
 	cd pkg \
-		&& GOFLAGS=-mod=mod go generate ./...
+		&& go generate ./... \
+		&& cd wire && wire gen
 
-test: generate
+test: clean generate
 	cd pkg && PHASE=test gotest -v ./... $(ARGS)
 
-ci-test: prepare build
+ci-test: build
 	cd pkg && PHASE=test go test -json ./... | tee /tmp/gotest.log | gotestfmt
 
 develop:
diff --git a/pkg/messaging/handler/bot_message.go b/pkg/messaging/handler/bot_message.go
index ac9bbbd..787f17a 100644
--- a/pkg/messaging/handler/bot_message.go
+++ b/pkg/messaging/handler/bot_message.go
@@ -241,7 +241,9 @@ func (bh *BotHandlerImpl) extractMemberName(text string) string {
 		return ""
 	}
 
-	return strings.TrimSuffix(trimmed, JOIN_MESSAGE_SUFFIX)
+	name := strings.TrimSuffix(trimmed, JOIN_MESSAGE_SUFFIX)
+	name = strings.Trim(name, " 　")
+	return name
 }
 
 func (bh *BotHandlerImpl) addNewMember(event *linebot.Event, group *store.Group, memberName string) error {
diff --git a/pkg/messaging/handler/bot_message_test.go b/pkg/messaging/handler/bot_message_test.go
index f24f19a..c92af49 100644
--- a/pkg/messaging/handler/bot_message_test.go
+++ b/pkg/messaging/handler/bot_message_test.go
@@ -118,7 +118,7 @@ func TestHandleTextMessage_addNewMember_secondPerson_success(t *testing.T) {
 
 	// Test handler.handleTextMessage call.
 	event := newTestMessageEvent(REPLY_TOKEN, linebot.EventSourceTypeGroup, GROUP_ID, SENDER_ID)
-	message := newTextMessage("花子だよ〜！")
+	message := newTextMessage("花子　だよ〜！")
 	err := target.handleTextMessage(event, message)
 
 	assert.Nil(t, err)
diff --git a/pkg/wire/wire_gen.go b/pkg/wire/wire_gen.go
new file mode 100644
index 0000000..f74c749
--- /dev/null
+++ b/pkg/wire/wire_gen.go
@@ -0,0 +1,43 @@
+// Code generated by Wire. DO NOT EDIT.
+
+//go:generate go run -mod=mod github.com/google/wire/cmd/wire
+//go:build !wireinject
+// +build !wireinject
+
+package wire
+
+import (
+	"github.com/google/wire"
+	"github.com/raahii/haraiai/pkg/client"
+	"github.com/raahii/haraiai/pkg/messaging/config"
+	"github.com/raahii/haraiai/pkg/messaging/flexmessage"
+	"github.com/raahii/haraiai/pkg/messaging/handler"
+	"github.com/raahii/haraiai/pkg/store"
+)
+
+// Injectors from wire.go:
+
+func BuildBotHandler() (handler.BotHandler, error) {
+	botConfig, err := config.ProvideBotConfig()
+	if err != nil {
+		return nil, err
+	}
+	botClient, err := client.ProvideBotClient()
+	if err != nil {
+		return nil, err
+	}
+	flexMessageBuilder := flexmessage.ProvideFlexMessageBuilder(botConfig)
+	storeStore, err := store.ProvideStore()
+	if err != nil {
+		return nil, err
+	}
+	botHandler, err := handler.ProvideBotHandler(botConfig, botClient, flexMessageBuilder, storeStore)
+	if err != nil {
+		return nil, err
+	}
+	return botHandler, nil
+}
+
+// wire.go:
+
+var mainSet = wire.NewSet(config.ProvideBotConfig, client.ProvideBotClient, store.ProvideStore, flexmessage.ProvideFlexMessageBuilder, handler.ProvideBotHandler)