fix context/transfer order.

M