KAFKA-1317 follow up fix