diff --git a/lib/game.rb b/lib/game.rb
index eb8f0da..ef43595 100644
--- a/lib/game.rb
+++ b/lib/game.rb
@@ -68,15 +68,15 @@ class Game
     follow_player.play(follow_card)
 
     if lead_card.suit != follow_card.suit && follow_card.suit != @trump_suit
-      @trick_winner = @player1
+      @trick_winner = lead_player
     elsif lead_card.suit == follow_card.suit && lead_card.strength > follow_card.strength
-      @trick_winner = @player1
+      @trick_winner = lead_player
     else
-      @trick_winner = @player2
+      @trick_winner = follow_player
     end
 
     @trick_winner.add_point
-    @ui.display_trick_winner(trick_winner)
+    @ui.display_trick_winner(@trick_winner)
   end
 
   def other_player(player)
@@ -89,10 +89,10 @@ class Game
 
     5.times do
       play_trick(lead_player, follow_player)
-    end
 
     lead_player = @trick_winner
     follow_player = other_player(lead_player)
+    end
   end
 
   def game_winner