Fix for Card Matching Logic