fix for KAFKA-1803