diff --git a/src/cpp/client/channel.cc b/src/cpp/client/channel.cc
index 7a21ec18040ff8816b599223d4f120d848d39d2d..7d95518631f25c31fdbe84c05bc1c7128dc84716 100644
--- a/src/cpp/client/channel.cc
+++ b/src/cpp/client/channel.cc
@@ -170,10 +170,8 @@ StreamContextInterface* Channel::CreateStream(const RpcMethod& method,
                                               ClientContext* context,
                                               const google::protobuf::Message* request,
                                               google::protobuf::Message* result) {
-  grpc_call* call =
-      grpc_channel_create_call(c_channel_, method.name(),
-                               // FIXME(yangg)
-                               "localhost", context->RawDeadline());
+  grpc_call* call = grpc_channel_create_call(
+      c_channel_, method.name(), target_.c_str(), context->RawDeadline());
   context->set_call(call);
   grpc_completion_queue* cq = grpc_completion_queue_create();
   context->set_cq(cq);