fixing order to fix build errors hopefully