diff --git a/console_play.py b/console_play.py
index 4a080a5..626597f 100644
--- a/console_play.py
+++ b/console_play.py
@@ -34,7 +34,8 @@ def play_unconstrained():
         while(action == ""):
             action = input("> ")
 
-        action = " You " + action + "."
+        action = "You " + action + "."
+        action = first_to_second_person(action)
         result = story_manager.act(action)
         console_print("\n\n" + action + result)
 
diff --git a/story/utils.py b/story/utils.py
index 0e8902f..ed1ad71 100644
--- a/story/utils.py
+++ b/story/utils.py
@@ -92,7 +92,7 @@ def mapping_variation_pairs(mapping):
     # Change you it's before a punctuation
     if mapping[0] is "you":
         mapping = ("you", "me")
-    mapping_list.append((" " + mapping[0]+"\,", " " + mapping[1]+"\,"))
+    mapping_list.append((" " + mapping[0]+"\,", " " + mapping[1]+","))
     mapping_list.append((" " + mapping[0]+"\?", " " + mapping[1]+"\?"))
     mapping_list.append((" " + mapping[0]+"\!", " " + mapping[1]+"\!"))
     mapping_list.append((" " + mapping[0] + "\.", " " + mapping[1] + "."))