Fix for Kafka 0.8