Improve copySectorToSwap