Additional fix for card selection