adjusting tear down call order