diff --git a/lib/battle.py b/lib/battle.py
index 6f24ac4..8c437a8 100644
--- a/lib/battle.py
+++ b/lib/battle.py
@@ -577,9 +577,7 @@ class Combatant():
             print "{} doesn't have a second wind.".format(self)
             return
         
-        self.surges -= 1
         self.sw -= 1
-
         print '{} got their second wind!'.format(self)
 
         # Now the actual effects of the SW
diff --git a/lib/easyinput.py b/lib/easyinput.py
index cb2a4af..60d917c 100644
--- a/lib/easyinput.py
+++ b/lib/easyinput.py
@@ -32,5 +32,5 @@ def do_data_input_str(data, index, prompt, default=None, show_default=False, pro
         return input_str(prompt, default, show_default, prompt_str)
 
 
-def do_data_input_int(battle, data, index, prompt, default=None, show_default=True, prompt_str=':'):
-    return int(do_data_select_str(battle, data, index, prompt, default, show_default, prompt_str))
+def do_data_input_int(data, index, prompt, default=None, show_default=True, prompt_str=':'):
+    return int(do_data_input_str(data, index, prompt, default, show_default, prompt_str))