1 files changed, 4 insertions, 5 deletions

diff --git a/kronos/parser.py b/kronos/parser.py
index 147682f..cf848e0 100644
--- a/kronos/parser.py
+++ b/kronos/parser.py
@@ -11,16 +11,15 @@ from kronos.model import Activity
 
 
 def parse_activity(text):
+    tokens = text.split(' ')
+    tags = _parse_tags(tokens)
+    text = _strip_tags(tokens)
+
     description = None
-    tags = []
     if ',' in text:
         text, description = text.split(',', 1)
         description = description.strip()
 
-        tokens = description.split(' ')
-        tags = _parse_tags(tokens)
-        description = _strip_tags(tokens)
-
     category = None
     if '@' in text:
         text, category = text.split('@', 1)