diff --git a/mods/character-select-coop/main.lua b/mods/character-select-coop/main.lua
index 3ddff3826..a8a0c1dea 100644
--- a/mods/character-select-coop/main.lua
+++ b/mods/character-select-coop/main.lua
@@ -244,20 +244,21 @@ local function mario_update(m)
     end
     
     if m.playerIndex == 0 and stallFrame > 1 then
-        characterTable[1].forceChar = gNetworkPlayers[m.playerIndex].modelIndex
+        local modelIndex = gNetworkPlayers[m.playerIndex].modelIndex
+        characterTable[1].forceChar = modelIndex
         if currChar == 1 then
-            characterTable[1].color = defaultPlayerColors[gNetworkPlayers[m.playerIndex].modelIndex]
-            characterTable[1].lifeIcon = defaultIcons[gNetworkPlayers[m.playerIndex].modelIndex]
+            characterTable[1].color = defaultPlayerColors[modelIndex]
+            characterTable[1].lifeIcon = defaultIcons[modelIndex]
         end
         if optionTable[optionTableRef.localModels].toggle > 0 then
-            gPlayerSyncTable[0].modelId = characterTable[currChar].model
-            gPlayerSyncTable[0].capModels = characterTable[currChar].capModels
+            gPlayerSyncTable[m.playerIndex].modelId = characterTable[currChar].model
+            gPlayerSyncTable[m.playerIndex].capModels = characterTable[currChar].capModels
             if characterTable[currChar].forceChar ~= nil then
                 gNetworkPlayers[m.playerIndex].overrideModelIndex = characterTable[currChar].forceChar
             end
         else
-            gPlayerSyncTable[0].modelId = nil
-            gPlayerSyncTable[0].capModels = nil
+            gPlayerSyncTable[m.playerIndex].modelId = nil
+            gPlayerSyncTable[m.playerIndex].capModels = nil
             gNetworkPlayers[m.playerIndex].overrideModelIndex = characterTable[1].forceChar
         end
 
diff --git a/mods/character-select-coop/textures/char-select-text.tex b/mods/character-select-coop/textures/char-select-text.tex
index 7e4099310..f679a2db4 100644
Binary files a/mods/character-select-coop/textures/char-select-text.tex and b/mods/character-select-coop/textures/char-select-text.tex differ
diff --git a/mods/character-select-coop/textures/unknown-icon.tex b/mods/character-select-coop/textures/unknown-icon.tex
index 4a2c1483a..92ccf76c8 100644
Binary files a/mods/character-select-coop/textures/unknown-icon.tex and b/mods/character-select-coop/textures/unknown-icon.tex differ
diff --git a/mods/character-select-coop/z-dev-32.lua b/mods/character-select-coop/z-dev-32.lua
index 49a7dffcb..d4c101b82 100644
Binary files a/mods/character-select-coop/z-dev-32.lua and b/mods/character-select-coop/z-dev-32.lua differ
diff --git a/mods/character-select-coop/z-dev-64.lua b/mods/character-select-coop/z-dev-64.lua
index 6de4aacde..d8b4b1d3f 100644
Binary files a/mods/character-select-coop/z-dev-64.lua and b/mods/character-select-coop/z-dev-64.lua differ