Fixed additional ghost card issues