Follow-up on e57ce77e9c7243fbdc37b0dac8f19eaa3ce4960c