Follow up fix for #16495