Fixed bug when using new card
Merge branch 'feature-saved-cards' into custom-aplus2