diff --git a/system_mockup/analizator_jezyka_naturalnego.py b/system_mockup/analizator_jezyka_naturalnego.py
index ce8643a..8cbfdd3 100644
--- a/system_mockup/analizator_jezyka_naturalnego.py
+++ b/system_mockup/analizator_jezyka_naturalnego.py
@@ -1,8 +1,8 @@
 import jsgf
 from os import listdir
-from os.path import isfile, join
+from os.path import isfile, join, dirname, abspath
 
-mypath = "../semantic_parser/gramatics/"
+mypath = dirname(abspath(__file__)) + "/../semantic_parser/gramatics/"
 onlyfiles = [f for f in listdir(mypath) if isfile(join(mypath, f))]
 
 grammars = []
diff --git a/system_mockup/monitor_stanu_dialogowego.py b/system_mockup/monitor_stanu_dialogowego.py
index 5253828..2f28f9d 100644
--- a/system_mockup/monitor_stanu_dialogowego.py
+++ b/system_mockup/monitor_stanu_dialogowego.py
@@ -60,9 +60,7 @@ def incr_counter(dialogue_state):
     current_val = dialogue_state['counter']
     dialogue_state['counter'] = current_val + 1
 
-def reset_state_if_needed(frame):
-    global iterator
+def reset_state_if_needed(frame, dialogue_state):
     if frame['act'] == "hello" or frame['act'] == "bye":
-        dialogue_state.clear()
-        iterator = 1
-
+        dialogue_state['topics'] = []
+        dialogue_state['counter'] = 0