fix cross-device moving