Further fixed card bug