diff --git a/plugins/extensions/pykrita/plugin/plugins/scripter/debugger_scripter/debugger.py b/plugins/extensions/pykrita/plugin/plugins/scripter/debugger_scripter/debugger.py
index 9b96c43857..eb7bf49953 100644
--- a/plugins/extensions/pykrita/plugin/plugins/scripter/debugger_scripter/debugger.py
+++ b/plugins/extensions/pykrita/plugin/plugins/scripter/debugger_scripter/debugger.py
@@ -1,114 +1,114 @@
 import bdb
 import asyncio
 import inspect
 import multiprocessing
 import re
 
 
 class Debugger(bdb.Bdb):
 
     def __init__(self, scripter, cmd):
         bdb.Bdb.__init__(self)
 
         self.quit = False
         self.debugq = multiprocessing.Queue()
         self.scripter = scripter
         self.applicationq = multiprocessing.Queue()
-
+        self.filePath = self.scripter.documentcontroller.activeDocument.filePath
         # Create the debug process
         self.debugprocess = multiprocessing.Process(target=self.run, args=(cmd,))
         self.application_data = {}
         self.currentLine = 0
         # initialize parent
         bdb.Bdb.reset(self)
 
     def user_call(self, frame, args):
         name = frame.f_code.co_name or "<unknown>"
 
     def user_line(self, frame):
         """Handler that executes with every line of code"""
         co = frame.f_code
+
+        if self.filePath!=co.co_filename:
+            return
+
         self.currentLine = frame.f_lineno
         self.applicationq.put({ "code": { "file": co.co_filename,
                                           "name": co.co_name,
                                           "lineNumber": str(frame.f_lineno)
                                         },
                                 "frame": { "firstLineNumber": co.co_firstlineno,
                                            "locals": self.format_data(frame.f_locals),
                                            "globals": self.format_data(frame.f_globals)
                                           },
                                 "trace": "line"
                               })
-
         if self.quit:
             return self.set_quit()
 
         if self.currentLine==0:
             return
         else:
-            # Get a reference to the code object and source
-            source = inspect.getsourcelines(co)[0]
-
             # Wait for a debug command
             cmd = self.debugq.get()
 
             if cmd == "step":
                 # If stepping through code, return this handler
                 return
 
             if cmd == "stop":
                 # If stopping execution, raise an exception
                 return self.set_quit()
 
     def user_return(self, frame, value):
         name = frame.f_code.co_name or "<unknown>"
         if name == '<module>':
             self.applicationq.put({ "quit": True})
 
     def user_exception(self, frame, exception):
         name = frame.f_code.co_name or "<unknown>"
 
     def format_data(self, data):
         globals()['types'] = __import__('types')
 
         exclude_keys = ['copyright', 'credits', 'False',
                         'True', 'None', 'Ellipsis', 'quit']
         exclude_valuetypes = [types.BuiltinFunctionType,
                               types.BuiltinMethodType,
                               types.ModuleType,
                               types.FunctionType]
 
         return [{k: v} for k, v in data.items() if not (k in exclude_keys or
                                                     type(v) in exclude_valuetypes or
                                                     re.search(r'^(__).*\1$', k))]
 
 
     async def display(self):
         """Coroutine for updating the UI"""
 
         # Wait for the application queue to have an update to the GUI
         while True:
             if self.applicationq.empty():
                 await asyncio.sleep(0.3)
             else:
                 # The application queue has at least one item, let's act on every item that's in it
                 while not self.applicationq.empty():
                     # Get info to the GUI
                      self.application_data = self.applicationq.get()
                      self.scripter.uicontroller.repaintDebugArea()
                 return
 
     async def start(self):
         await self.display()
 
     async def step(self):
         # Tell the debugger we want to step in
         self.debugq.put("step")
 
         await self.display()
 
     async def stop(self):
         # Tell the debugger we're stopping execution
         self.debugq.put("stop")
         self.applicationq.put({ "quit": True})
         await self.display()
diff --git a/plugins/extensions/pykrita/plugin/plugins/scripter/ui_scripter/stackwidgets/debuggerwidget/debuggertable.py b/plugins/extensions/pykrita/plugin/plugins/scripter/ui_scripter/stackwidgets/debuggerwidget/debuggertable.py
index c07f78eae1..8be672b26f 100644
--- a/plugins/extensions/pykrita/plugin/plugins/scripter/ui_scripter/stackwidgets/debuggerwidget/debuggertable.py
+++ b/plugins/extensions/pykrita/plugin/plugins/scripter/ui_scripter/stackwidgets/debuggerwidget/debuggertable.py
@@ -1,38 +1,38 @@
 from PyQt5.QtWidgets import QTableWidget, QTableWidgetItem
 
 
 class DebuggerTable(QTableWidget):
 
     def __init__(self, parent=None):
         super(DebuggerTable, self).__init__(parent)
 
         self.setRowCount(10)
         self.setColumnCount(4)
 
         tableHeader = ['Scope', 'Name', 'Value', 'Type']
         self.setHorizontalHeaderLabels(tableHeader)
         self.setEditTriggers(self.NoEditTriggers)
 
     def updateTable(self, data):
         self.clearContents()
 
         if data and not data.get('quit'):
             line = 0
             locals_list = data['frame']['locals']
             globals_list = data['frame']['globals']
 
-            for item in locals_list:
-                for key, value in item.items():
-                    self.setItem(line, 0, QTableWidgetItem('locals'))
-                    self.setItem(line, 1, QTableWidgetItem(key))
-                    self.setItem(line, 2, QTableWidgetItem(str(value)))
-                    self.setItem(line, 3, QTableWidgetItem(str(type(value))))
-                    line += 1
-
-            for item in globals_list:
-                for key, value in item.items():
-                    self.setItem(line, 0, QTableWidgetItem('globals'))
-                    self.setItem(line, 1, QTableWidgetItem(key))
-                    self.setItem(line, 2, QTableWidgetItem(str(value)))
-                    self.setItem(line, 3, QTableWidgetItem(str(type(value))))
-                    line += 1
+            # for item in locals_list:
+            #     for key, value in item.items():
+            #         self.setItem(line, 0, QTableWidgetItem('locals'))
+            #         self.setItem(line, 1, QTableWidgetItem(key))
+            #         self.setItem(line, 2, QTableWidgetItem(str(value)))
+            #         self.setItem(line, 3, QTableWidgetItem(str(type(value))))
+            #         line += 1
+            #
+            # for item in globals_list:
+            #     for key, value in item.items():
+            #         self.setItem(line, 0, QTableWidgetItem('globals'))
+            #         self.setItem(line, 1, QTableWidgetItem(key))
+            #         self.setItem(line, 2, QTableWidgetItem(str(value)))
+            #         self.setItem(line, 3, QTableWidgetItem(str(type(value))))
+            #         line += 1