fix ordering from #3540