diff --git a/acl_create_request.go b/acl_create_request.go
index e581c984a..d5715471c 100644
--- a/acl_create_request.go
+++ b/acl_create_request.go
@@ -52,7 +52,7 @@ func (c *CreateAclsRequest) headerVersion() int16 {
 }
 
 func (c *CreateAclsRequest) isValidVersion() bool {
-	return c.Version >= 0 && c.Version <= 1
+	return c.Version == 0 || c.Version == 1
 }
 
 func (c *CreateAclsRequest) requiredVersion() KafkaVersion {
diff --git a/acl_create_response.go b/acl_create_response.go
index d123ba863..b5d53f1d0 100644
--- a/acl_create_response.go
+++ b/acl_create_response.go
@@ -61,7 +61,7 @@ func (c *CreateAclsResponse) headerVersion() int16 {
 }
 
 func (c *CreateAclsResponse) isValidVersion() bool {
-	return c.Version >= 0 && c.Version <= 1
+	return c.Version == 0 || c.Version == 1
 }
 
 func (c *CreateAclsResponse) requiredVersion() KafkaVersion {
diff --git a/acl_delete_request.go b/acl_delete_request.go
index abeb4425e..e975483e7 100644
--- a/acl_delete_request.go
+++ b/acl_delete_request.go
@@ -53,7 +53,7 @@ func (d *DeleteAclsRequest) headerVersion() int16 {
 }
 
 func (d *DeleteAclsRequest) isValidVersion() bool {
-	return d.Version >= 0 && d.Version <= 1
+	return d.Version == 0 || d.Version == 1
 }
 
 func (d *DeleteAclsRequest) requiredVersion() KafkaVersion {
diff --git a/acl_delete_response.go b/acl_delete_response.go
index 2e2850b32..c654d146f 100644
--- a/acl_delete_response.go
+++ b/acl_delete_response.go
@@ -61,7 +61,7 @@ func (d *DeleteAclsResponse) headerVersion() int16 {
 }
 
 func (d *DeleteAclsResponse) isValidVersion() bool {
-	return d.Version >= 0 && d.Version <= 1
+	return d.Version == 0 || d.Version == 1
 }
 
 func (d *DeleteAclsResponse) requiredVersion() KafkaVersion {
diff --git a/acl_describe_request.go b/acl_describe_request.go
index 7d65bef14..350a4521a 100644
--- a/acl_describe_request.go
+++ b/acl_describe_request.go
@@ -30,7 +30,7 @@ func (d *DescribeAclsRequest) headerVersion() int16 {
 }
 
 func (d *DescribeAclsRequest) isValidVersion() bool {
-	return d.Version >= 0 && d.Version <= 1
+	return d.Version == 0 || d.Version == 1
 }
 
 func (d *DescribeAclsRequest) requiredVersion() KafkaVersion {
diff --git a/acl_describe_response.go b/acl_describe_response.go
index f89a53b66..d4de7830d 100644
--- a/acl_describe_response.go
+++ b/acl_describe_response.go
@@ -82,7 +82,7 @@ func (d *DescribeAclsResponse) headerVersion() int16 {
 }
 
 func (d *DescribeAclsResponse) isValidVersion() bool {
-	return d.Version >= 0 && d.Version <= 1
+	return d.Version == 0 || d.Version == 1
 }
 
 func (d *DescribeAclsResponse) requiredVersion() KafkaVersion {
diff --git a/alter_configs_request.go b/alter_configs_request.go
index ee1ab6445..fe1fe9f94 100644
--- a/alter_configs_request.go
+++ b/alter_configs_request.go
@@ -123,7 +123,7 @@ func (a *AlterConfigsRequest) headerVersion() int16 {
 }
 
 func (a *AlterConfigsRequest) isValidVersion() bool {
-	return a.Version >= 0 && a.Version <= 1
+	return a.Version == 0 || a.Version == 1
 }
 
 func (a *AlterConfigsRequest) requiredVersion() KafkaVersion {
diff --git a/alter_configs_response.go b/alter_configs_response.go
index d8b70e371..6316eb860 100644
--- a/alter_configs_response.go
+++ b/alter_configs_response.go
@@ -129,7 +129,7 @@ func (a *AlterConfigsResponse) headerVersion() int16 {
 }
 
 func (a *AlterConfigsResponse) isValidVersion() bool {
-	return a.Version >= 0 && a.Version <= 1
+	return a.Version == 0 || a.Version == 1
 }
 
 func (a *AlterConfigsResponse) requiredVersion() KafkaVersion {
diff --git a/create_partitions_request.go b/create_partitions_request.go
index 3f5512656..e9a8b39ac 100644
--- a/create_partitions_request.go
+++ b/create_partitions_request.go
@@ -73,7 +73,7 @@ func (r *CreatePartitionsRequest) headerVersion() int16 {
 }
 
 func (r *CreatePartitionsRequest) isValidVersion() bool {
-	return r.Version >= 0 && r.Version <= 1
+	return r.Version == 0 || r.Version == 1
 }
 
 func (r *CreatePartitionsRequest) requiredVersion() KafkaVersion {
diff --git a/create_partitions_response.go b/create_partitions_response.go
index c9e7ea72c..13db7c9e4 100644
--- a/create_partitions_response.go
+++ b/create_partitions_response.go
@@ -69,7 +69,7 @@ func (r *CreatePartitionsResponse) headerVersion() int16 {
 }
 
 func (r *CreatePartitionsResponse) isValidVersion() bool {
-	return r.Version >= 0 && r.Version <= 1
+	return r.Version == 0 || r.Version == 1
 }
 
 func (r *CreatePartitionsResponse) requiredVersion() KafkaVersion {
diff --git a/delete_groups_request.go b/delete_groups_request.go
index 2fdfc3386..52aaa8686 100644
--- a/delete_groups_request.go
+++ b/delete_groups_request.go
@@ -27,7 +27,7 @@ func (r *DeleteGroupsRequest) headerVersion() int16 {
 }
 
 func (r *DeleteGroupsRequest) isValidVersion() bool {
-	return r.Version >= 0 && r.Version <= 1
+	return r.Version == 0 || r.Version == 1
 }
 
 func (r *DeleteGroupsRequest) requiredVersion() KafkaVersion {
diff --git a/delete_groups_response.go b/delete_groups_response.go
index e490f8314..e832afcb1 100644
--- a/delete_groups_response.go
+++ b/delete_groups_response.go
@@ -71,7 +71,7 @@ func (r *DeleteGroupsResponse) headerVersion() int16 {
 }
 
 func (r *DeleteGroupsResponse) isValidVersion() bool {
-	return r.Version >= 0 && r.Version <= 1
+	return r.Version == 0 || r.Version == 1
 }
 
 func (r *DeleteGroupsResponse) requiredVersion() KafkaVersion {
diff --git a/delete_records_request.go b/delete_records_request.go
index 3ca2146af..a7bf8072f 100644
--- a/delete_records_request.go
+++ b/delete_records_request.go
@@ -83,7 +83,7 @@ func (d *DeleteRecordsRequest) headerVersion() int16 {
 }
 
 func (d *DeleteRecordsRequest) isValidVersion() bool {
-	return d.Version >= 0 && d.Version <= 1
+	return d.Version == 0 || d.Version == 1
 }
 
 func (d *DeleteRecordsRequest) requiredVersion() KafkaVersion {
diff --git a/delete_records_response.go b/delete_records_response.go
index 2d7db885b..2fc7be107 100644
--- a/delete_records_response.go
+++ b/delete_records_response.go
@@ -85,7 +85,7 @@ func (d *DeleteRecordsResponse) headerVersion() int16 {
 }
 
 func (d *DeleteRecordsResponse) isValidVersion() bool {
-	return d.Version >= 0 && d.Version <= 1
+	return d.Version == 0 || d.Version == 1
 }
 
 func (d *DeleteRecordsResponse) requiredVersion() KafkaVersion {
diff --git a/describe_log_dirs_request.go b/describe_log_dirs_request.go
index a6613c320..e27ca01a7 100644
--- a/describe_log_dirs_request.go
+++ b/describe_log_dirs_request.go
@@ -83,7 +83,7 @@ func (r *DescribeLogDirsRequest) headerVersion() int16 {
 }
 
 func (r *DescribeLogDirsRequest) isValidVersion() bool {
-	return r.Version >= 0 && r.Version <= 1
+	return r.Version == 0 || r.Version == 1
 }
 
 func (r *DescribeLogDirsRequest) requiredVersion() KafkaVersion {
diff --git a/describe_log_dirs_response.go b/describe_log_dirs_response.go
index 41b4968da..f82e3c2d5 100644
--- a/describe_log_dirs_response.go
+++ b/describe_log_dirs_response.go
@@ -66,7 +66,7 @@ func (r *DescribeLogDirsResponse) headerVersion() int16 {
 }
 
 func (r *DescribeLogDirsResponse) isValidVersion() bool {
-	return r.Version >= 0 && r.Version <= 1
+	return r.Version == 0 || r.Version == 1
 }
 
 func (r *DescribeLogDirsResponse) requiredVersion() KafkaVersion {
diff --git a/sasl_authenticate_request.go b/sasl_authenticate_request.go
index 3a562a53b..6b0244d8d 100644
--- a/sasl_authenticate_request.go
+++ b/sasl_authenticate_request.go
@@ -32,7 +32,7 @@ func (r *SaslAuthenticateRequest) headerVersion() int16 {
 }
 
 func (r *SaslAuthenticateRequest) isValidVersion() bool {
-	return r.Version >= 0 && r.Version <= 1
+	return r.Version == 0 || r.Version == 1
 }
 
 func (r *SaslAuthenticateRequest) requiredVersion() KafkaVersion {
diff --git a/sasl_authenticate_response.go b/sasl_authenticate_response.go
index ae52cde1c..02361844b 100644
--- a/sasl_authenticate_response.go
+++ b/sasl_authenticate_response.go
@@ -60,7 +60,7 @@ func (r *SaslAuthenticateResponse) headerVersion() int16 {
 }
 
 func (r *SaslAuthenticateResponse) isValidVersion() bool {
-	return r.Version >= 0 && r.Version <= 1
+	return r.Version == 0 || r.Version == 1
 }
 
 func (r *SaslAuthenticateResponse) requiredVersion() KafkaVersion {
diff --git a/sasl_handshake_request.go b/sasl_handshake_request.go
index 410a5b0ea..c93c157fc 100644
--- a/sasl_handshake_request.go
+++ b/sasl_handshake_request.go
@@ -34,7 +34,7 @@ func (r *SaslHandshakeRequest) headerVersion() int16 {
 }
 
 func (r *SaslHandshakeRequest) isValidVersion() bool {
-	return r.Version >= 0 && r.Version <= 1
+	return r.Version == 0 || r.Version == 1
 }
 
 func (r *SaslHandshakeRequest) requiredVersion() KafkaVersion {
diff --git a/sasl_handshake_response.go b/sasl_handshake_response.go
index 502732cbd..1cecd80b0 100644
--- a/sasl_handshake_response.go
+++ b/sasl_handshake_response.go
@@ -39,7 +39,7 @@ func (r *SaslHandshakeResponse) headerVersion() int16 {
 }
 
 func (r *SaslHandshakeResponse) isValidVersion() bool {
-	return r.Version >= 0 && r.Version <= 1
+	return r.Version == 0 || r.Version == 1
 }
 
 func (r *SaslHandshakeResponse) requiredVersion() KafkaVersion {