Card Swap fix