Follow up to 9173fa50ef2887b28603f223a102448a2c69a234