Added swap fix