yet another swap fix