fixed card swapping

Base version