diff --git a/app/models/game.rb b/app/models/game.rb
index 0e0613e..81bcf46 100644
--- a/app/models/game.rb
+++ b/app/models/game.rb
@@ -131,12 +131,12 @@ class Game < ActiveRecord::Base
   end
 
   def player_ids_by_seat_order
-    player_ids = self.seats.order(:position).select {|s| s.player_id}.map {|s| s.player_id}
+    player_ids = self.seats.order(:position).select {|s| ( s.player.inventory.count > 0) ? s.player_id : nil}.compact.map {|s| s.player_id}
   end
 
   def next_player_id
     @controlling_player_index = self.player_ids_by_seat_order.index(controlling_player_id)
-    player_ids_by_seat_order[(@controlling_player_index + 1) % self.player_ids.length]
+    player_ids_by_seat_order[(@controlling_player_index + 1) % self.player_ids_by_seat_order.length]
   end
 
   # The player whose turn it is