Card Fix part 2