Fix order lifecycle