Fixing duplicate hasCard definitions