Improve card check