fix ordering issue