diff --git a/README.md b/README.md
index bfe7e02..3b458fa 100644
--- a/README.md
+++ b/README.md
@@ -62,11 +62,11 @@ As you can see, the `-target` supports default `typescript`, any git URI, or a l
 
 Change any of the following values by passing `-option="Value"` CLI flag to `webrpc-gen`.
 
-| webrpc-gen -option | Description          | Default value                                     | Version |
-| ------------------ | -------------------- | ------------------------------------------------- | ------- |
-| `-client`          | generate client code | unset (`false`)                                   | v0.0.1  |
-| `-server`          | generate server code | unset (`false`)                                   | v0.0.1  |
-| `-webrpcHeader`    | `true`               | enable client send webrpc version in http headers | v0.15.0 |
+| webrpc-gen -option | Description                             | Default value | Version |
+| ------------------ | --------------------------------------- | ------------- | ------- |
+| `-client`          | generate client code                    | `false`       | v0.0.1  |
+| `-server`          | generate server code                    | `false`       | v0.0.1  |
+| `-webrpcHeader`    | send Webrpc header in all HTTP requests | `true`        | v0.15.0 |
 
 **Note:** Generated code requires ES2022+ runtime environment.
 
diff --git a/_examples/node-ts/server-fastify/server.gen.ts b/_examples/node-ts/server-fastify/server.gen.ts
index 0396f43..a32ce50 100644
--- a/_examples/node-ts/server-fastify/server.gen.ts
+++ b/_examples/node-ts/server-fastify/server.gen.ts
@@ -1,7 +1,7 @@
 /* eslint-disable */
 // node-ts v1.0.0 21701cae51b73d035bf2180831cdb38220bbbccc
 // --
-// Code generated by Webrpc-gen@v0.30.1-1-gda1b8b7 with ../../../gen-typescript generator. DO NOT EDIT.
+// Code generated by Webrpc-gen@v0.30.2 with ../../../gen-typescript generator. DO NOT EDIT.
 //
 // webrpc-gen -schema=service.ridl -target=../../../gen-typescript -server -out=./server-fastify/server.gen.ts
 
diff --git a/_examples/node-ts/server-hono/server.gen.ts b/_examples/node-ts/server-hono/server.gen.ts
index 6cbce80..a46b3d8 100644
--- a/_examples/node-ts/server-hono/server.gen.ts
+++ b/_examples/node-ts/server-hono/server.gen.ts
@@ -1,7 +1,7 @@
 /* eslint-disable */
 // node-ts v1.0.0 21701cae51b73d035bf2180831cdb38220bbbccc
 // --
-// Code generated by Webrpc-gen@v0.30.1-1-gda1b8b7 with ../../../gen-typescript generator. DO NOT EDIT.
+// Code generated by Webrpc-gen@v0.30.2 with ../../../gen-typescript generator. DO NOT EDIT.
 //
 // webrpc-gen -schema=service.ridl -target=../../../gen-typescript -server -out=./server-hono/server.gen.ts
 
diff --git a/_examples/node-ts/server/server.gen.ts b/_examples/node-ts/server/server.gen.ts
index 40f6de5..3ecce86 100644
--- a/_examples/node-ts/server/server.gen.ts
+++ b/_examples/node-ts/server/server.gen.ts
@@ -1,7 +1,7 @@
 /* eslint-disable */
 // node-ts v1.0.0 21701cae51b73d035bf2180831cdb38220bbbccc
 // --
-// Code generated by Webrpc-gen@v0.30.1-1-gda1b8b7 with ../../../gen-typescript generator. DO NOT EDIT.
+// Code generated by Webrpc-gen@v0.30.2 with ../../../gen-typescript generator. DO NOT EDIT.
 //
 // webrpc-gen -schema=service.ridl -target=../../../gen-typescript -server -out=./server/server.gen.ts
 
diff --git a/_examples/node-ts/webapp/client.gen.ts b/_examples/node-ts/webapp/client.gen.ts
index 8037e67..8c73688 100644
--- a/_examples/node-ts/webapp/client.gen.ts
+++ b/_examples/node-ts/webapp/client.gen.ts
@@ -1,7 +1,7 @@
 /* eslint-disable */
 // node-ts v1.0.0 21701cae51b73d035bf2180831cdb38220bbbccc
 // --
-// Code generated by Webrpc-gen@v0.30.1-1-gda1b8b7 with ../../../gen-typescript generator. DO NOT EDIT.
+// Code generated by Webrpc-gen@v0.30.2 with ../../../gen-typescript generator. DO NOT EDIT.
 //
 // webrpc-gen -schema=service.ridl -target=../../../gen-typescript -client -out=./webapp/client.gen.ts
 
@@ -147,7 +147,7 @@ export class Example implements ExampleClient {
 }
 
 const createHttpRequest = (body: string = '{}', headers: object = {}, signal: AbortSignal | null = null): object => {
-  const reqHeaders: { [key: string]: string } = { ...headers, 'Content-Type': 'application/json' }
+  const reqHeaders: { [key: string]: string } = { ...headers, 'Content-Type': 'application/json', WebrpcHeader: WebrpcHeaderValue }
   return { method: 'POST', headers: reqHeaders, body, signal }
 }
 
diff --git a/_examples/sse/webapp/client.gen.ts b/_examples/sse/webapp/client.gen.ts
index 15374bd..9c3040c 100644
--- a/_examples/sse/webapp/client.gen.ts
+++ b/_examples/sse/webapp/client.gen.ts
@@ -1,7 +1,7 @@
 /* eslint-disable */
 // webrpc-sse-chat v1.0.0 a799dc63b082644f5d003c8881424546aee23a2c
 // --
-// Code generated by Webrpc-gen@v0.30.1-1-gda1b8b7 with ../../ generator. DO NOT EDIT.
+// Code generated by Webrpc-gen@v0.30.2 with ../../ generator. DO NOT EDIT.
 //
 // webrpc-gen -schema=service.ridl -target=../../ -client -out=./webapp/client.gen.ts
 
@@ -274,7 +274,7 @@ const sseResponse = async (
 
 
 const createHttpRequest = (body: string = '{}', headers: object = {}, signal: AbortSignal | null = null): object => {
-  const reqHeaders: { [key: string]: string } = { ...headers, 'Content-Type': 'application/json' }
+  const reqHeaders: { [key: string]: string } = { ...headers, 'Content-Type': 'application/json', WebrpcHeader: WebrpcHeaderValue }
   return { method: 'POST', headers: reqHeaders, body, signal }
 }
 
diff --git a/clientHelpers.go.tmpl b/clientHelpers.go.tmpl
index 50c6a25..b2832c5 100644
--- a/clientHelpers.go.tmpl
+++ b/clientHelpers.go.tmpl
@@ -5,10 +5,7 @@
 
 {{- "\n" -}}
 const createHttpRequest = (body: string = '{}', headers: object = {}, signal: AbortSignal | null = null): object => {
-  const reqHeaders: { [key: string]: string } = { ...headers, 'Content-Type': 'application/json' }
-  {{- if eq $opts.webrpcHeader true }}
-  reqHeaders[WebrpcHeader] = WebrpcHeaderValue
-  {{- end }}
+  const reqHeaders: { [key: string]: string } = { ...headers, 'Content-Type': 'application/json' {{- if eq $opts.webrpcHeader true }}, WebrpcHeader: WebrpcHeaderValue{{ end }} }
   return { method: 'POST', headers: reqHeaders, body, signal }
 }
 
diff --git a/main.go.tmpl b/main.go.tmpl
index 192d66a..9f8b716 100644
--- a/main.go.tmpl
+++ b/main.go.tmpl
@@ -5,7 +5,7 @@
 {{- set $opts "client" (ternary (in .Opts.client "" "true") true false) -}}
 {{- set $opts "server" (ternary (in .Opts.server "" "true") true false) -}}
 {{- set $opts "compat" (ternary (in .Opts.compat "" "true") true false) -}}
-{{- set $opts "WebrpcHeader" (ternary (eq (default .Opts.WebrpcHeader "true") "false") false true) -}}
+{{- set $opts "webrpcHeader" (ternary (eq (default .Opts.webrpcHeader "true") "false") false true) -}}
 
 {{- /* Print help on -help. */ -}}
 {{- if exists .Opts "help" -}}