fix ordering