Fixed Kafka issue