Fixed handoff fold.
Fixed sync for 2i