swap fix