Fixes card selection issues when using a deck without the ? card.
Merge branch 'origin/dev'