diff --git a/etcdserver/etcdhttp/http.go b/etcdserver/etcdhttp/http.go
index ee7ae6056..52507ac6e 100644
--- a/etcdserver/etcdhttp/http.go
+++ b/etcdserver/etcdhttp/http.go
@@ -147,7 +147,9 @@ func httpPost(url string, data []byte) bool {
 type Handler struct {
 	Timeout time.Duration
 	Server  *etcdserver.Server
-	Peers   Peers
+	// TODO: dynamic configuration may make this outdated. take care of it.
+	// TODO: dynamic configuration may introduce race also.
+	Peers Peers
 }
 
 func (h Handler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
diff --git a/main.go b/main.go
index 93fcdac2a..7ed63934d 100644
--- a/main.go
+++ b/main.go
@@ -70,7 +70,7 @@ func main() {
 	h := &etcdhttp.Handler{
 		Timeout: *timeout,
 		Server:  s,
-		Peers:   peers,
+		Peers:   *peers,
 	}
 	http.Handle("/", h)
 	log.Fatal(http.ListenAndServe(*laddr, nil))