diff --git a/BUILD b/BUILD
index 51f8bf83..13f747a6 100644
--- a/BUILD
+++ b/BUILD
@@ -1,6 +1,8 @@
 config_setting(
 	name = 'linux',
-	values = {'cpu': 'linux'},
+	constraint_values = [
+		"@platforms//os:linux",
+	],
 	visibility = ['//visibility:public'],
 )
 
diff --git a/src/factory/KafkaTaskImpl.cc b/src/factory/KafkaTaskImpl.cc
index 62c20d41..87d09e67 100644
--- a/src/factory/KafkaTaskImpl.cc
+++ b/src/factory/KafkaTaskImpl.cc
@@ -236,8 +236,9 @@ CommMessageOut *__ComplexKafkaTask::message_out()
 				}
 				else
 				{
-					toppar->set_offset(toppar->get_high_watermark());
+					toppar->set_offset(toppar->get_high_watermark() - 1);
 				}
+				continue;
 			}
 			else
 			{