Swap fix