Actually should fix the issue with the deck selection. Needs testing - mrracine