Fix distribution of Kafka messages