follow up from review part 2 #871