diff --git a/kafka-http-connector/main.go b/kafka-http-connector/main.go
index 86c3d37..c9d17f0 100644
--- a/kafka-http-connector/main.go
+++ b/kafka-http-connector/main.go
@@ -220,7 +220,7 @@ func (conn *kafkaConnector) ConsumeClaim(session sarama.ConsumerGroupSession, cl
 		// Set the headers came from Kafka record
 		for _, h := range message.Headers {
 			if utf8.ValidString(string(h.Value)) {
-				headers.Add(string(h.Key), string(h.Value))
+				headers.Set(string(h.Key), string(h.Value))
 			}
 		}
 
diff --git a/kafka-http-connector/version b/kafka-http-connector/version
index 2b8bac3..d314dc4 100644
--- a/kafka-http-connector/version
+++ b/kafka-http-connector/version
@@ -1 +1 @@
-v0.17
+v0.18