Fixing this to work with latest Kafka