Remove temporary fix - Doug has fixed termination order.