diff --git a/ExpCore/GuiParts/inputs.lua b/ExpCore/GuiParts/inputs.lua
index 94a6ac5f..f4547231 100644
--- a/ExpCore/GuiParts/inputs.lua
+++ b/ExpCore/GuiParts/inputs.lua
@@ -252,8 +252,9 @@ function inputs.reset_radio(elements)
             if element.valid then
                 local _elements = Gui._get_data('inputs_'..element.type) or {}
                 local _element = _elements[element.name]
+                local player = Game.get_player(element.player_index)
                 local state = false
-                local success, err = pcall(_element.data._state,element.parent)
+                local success, err = pcall(_element.data._state,player,element.parent)
                 if success then state = err else error(err) end
                 element.state = state
             end
@@ -262,8 +263,9 @@ function inputs.reset_radio(elements)
         if elements.valid then
             local _elements = Gui._get_data('inputs_'..elements.type) or {}
             local _element = _elements[elements.name]
+            local player = Game.get_player(elements.player_index)
             local state = false
-            local success, err = pcall(_element.data._state,elements.parent)
+            local success, err = pcall(_element.data._state,player,elements.parent)
             if success then state = err else error(err) end
             elements.state = state
         end
diff --git a/ExpCore/GuiParts/test.lua b/ExpCore/GuiParts/test.lua
index 38e2a95c..e682da18 100644
--- a/ExpCore/GuiParts/test.lua
+++ b/ExpCore/GuiParts/test.lua
@@ -93,7 +93,7 @@ end)
 local function test_gui(event)
     if not game.player and not event.player_index then return end
     local player = game.player or Game.get_player(event)
-    if mod_gui.get_frame_flow(player)['gui-test'] thenmod_gui.get_frame_flow(player)['gui-test'].destroy() end
+    if mod_gui.get_frame_flow(player)['gui-test'] then mod_gui.get_frame_flow(player)['gui-test'].destroy() end
     local frame = mod_gui.get_frame_flow(player).add{type='frame',name='gui-test',direction='vertical'}
     gui_tset_close:draw(frame)
     caption_test:draw(frame)