Second fix for duplicating card issue.
Merge pull request #943 from Gravecorp/test

Part 2 of OCT-6