diff --git a/Makefile b/Makefile
index 9b05ba4..1d5adeb 100644
--- a/Makefile
+++ b/Makefile
@@ -2,6 +2,7 @@ all: build
 
 GO := $(shell which go)
 GOPATH := "$(CURDIR)/vendor:$(CURDIR)"
+GOFMT := "$(shell dirname "$(GO)")/gofmt"
 GOOS ?= linux
 GOARCH ?= amd64
 BINDIR := "$(CURDIR)/bin"
@@ -64,7 +65,7 @@ get:
 	GOPATH=$(GOPATH) $(GO) get $(PACKAGE)
 
 fmt: hook
-	$(GO) fmt .
+	$(GOFMT) -s -w *.go client proxy server
 
 vet: common
 	$(GO) vet .
diff --git a/proxy/proxy_session.go b/proxy/proxy_session.go
index 560703f..1e22352 100644
--- a/proxy/proxy_session.go
+++ b/proxy/proxy_session.go
@@ -134,7 +134,7 @@ func (s *ProxySession) OnUpdateOffer(client signaling.McuClient, offer map[strin
 		Payload: &signaling.PayloadProxyServerMessage{
 			Type:     "offer",
 			ClientId: id,
-			Payload:  map[string]interface{}{
+			Payload: map[string]interface{}{
 				"offer": offer,
 			},
 		},