diff --git a/scripts/scr_roster/scr_roster.gml b/scripts/scr_roster/scr_roster.gml
index e53151cb4..5b0e550df 100644
--- a/scripts/scr_roster/scr_roster.gml
+++ b/scripts/scr_roster/scr_roster.gml
@@ -344,9 +344,11 @@ function Roster() constructor{
             array_push(company_buttons,_button);
         }
         var _ships = get_player_ships(roster_location);
+        var _ship_index;
         for (var s=0;s<array_length(_ships);s++){
-            if (obj_ini.ship_carrying[s]>0){
-                new_ship_button(obj_ini.ship[_ships[s]],_ships[s]);
+            _ship_index = _ships[s];
+            if (obj_ini.ship_carrying[_ship_index]>0){
+                new_ship_button(obj_ini.ship[_ship_index],_ship_index);
             }
         }
     }