Change order to fix build