Card replacement fix