Fixing issues with card saving.