Another one following #2639