Fixed the logic around the CardType field as well.