diff --git a/debug-viewer/GstDebugViewer/Data.py b/debug-viewer/GstDebugViewer/Data.py
index 3012f4abe0..448c129acc 100644
--- a/debug-viewer/GstDebugViewer/Data.py
+++ b/debug-viewer/GstDebugViewer/Data.py
@@ -124,7 +124,7 @@ def default_log_line_regex_ ():
     OBJECT = "(?:<([^>]+)>)?"
     MESSAGE = " (.+)"
 
-    expressions = [CATEGORY, FILENAME, LINE, FUNCTION, OBJECT]
+    expressions = [" *", CATEGORY, FILENAME, LINE, FUNCTION, OBJECT]
     # New log format:
     ## expressions = [TIME, PID, THREAD, LEVEL, CATEGORY, FILENAME, LINE, FUNCTION,
     ##                OBJECT, MESSAGE]
diff --git a/debug-viewer/GstDebugViewer/GUI.py b/debug-viewer/GstDebugViewer/GUI.py
index 49680b63f3..b1c88e1024 100755
--- a/debug-viewer/GstDebugViewer/GUI.py
+++ b/debug-viewer/GstDebugViewer/GUI.py
@@ -248,15 +248,15 @@ class LazyLogModel (LogModelBase):
             pid = int (pid_s)
             thread = int (thread_s, 16)
             level = Data.DebugLevel (level_s)
-            match = self.__line_regex.match (regex_line[:-len (os.linesep)].lstrip ())
+            match = self.__line_regex.match (regex_line[:-len (os.linesep)])
         except ValueError:
             match = None
 
         if match is None:
             # FIXME?
-            groups = [0, 0, 0, Data.DebugLevelNone, "", "", 0, "", "", ts_len]
+            groups = [0, 0, 0, Data.DebugLevelNone, "", "", 0, "", "", non_regex_len]
         else:            
-            groups = [ts, pid, thread, level] + list (match.groups ()) + [match.end ()]
+            groups = [ts, pid, thread, level] + list (match.groups ()) + [non_regex_len + match.end ()]
 
             for col_id in (self.COL_CATEGORY, self.COL_FILENAME, self.COL_FUNCTION,
                            self.COL_OBJECT,):