Fixup in data transfer