diff --git a/pyFG/fortios.py b/pyFG/fortios.py
index 23feef6..3e9e33f 100644
--- a/pyFG/fortios.py
+++ b/pyFG/fortios.py
@@ -169,7 +169,7 @@ def execute_command(self, command):
         # We look for the prompt and remove it
         i = 0
         for line in output:
-            current_line = line.split('#')
+            current_line = line.split(' # ')
 
             if len(current_line) > 1:
                 output[i] = current_line[1]