KAFKA-1459 follow up minor patch