Follow up from #2822
Follow up from #2822