Adds #1377 fix to card as well