Fixed ccard methods (again [for good this time])