Fixed another bug in handoff fold.