diff --git a/gameloop.py b/gameloop.py
index 5b95419..224c798 100644
--- a/gameloop.py
+++ b/gameloop.py
@@ -481,7 +481,7 @@ def game():
 				if player is czar:
 					notice(nick, 'Czar can\'t choose now')
 					continue
-				elif player not in choosers:
+				elif player not in choosers and player not in card_choices:
 					notice(nick, 'You\'ll get to choose next round')
 					continue
 
@@ -505,7 +505,8 @@ def game():
 					continue
 
 				card_choices[player] = selected_cards
-				choosers.remove(player)
+				if player in choosers:
+					choosers.remove(player)
 				notice(nick, combine_cards(round_call_card, [player.hand[i] for i in selected_cards]))
 
 			elif event == events.cards:
@@ -517,7 +518,7 @@ def game():
 
 				player = players[nick]
 
-				if player in choosers:
+				if player in choosers or player in card_choices:
 					send_cards(nick)
 				else:
 					notice(nick, 'You can\'t choose now')