diff --git a/features/data/configs/tags-216.json b/features/data/configs/tags-216.json
new file mode 100644
index 00000000..4164d6f5
--- /dev/null
+++ b/features/data/configs/tags-216.json
@@ -0,0 +1,14 @@
+{
+  "default_hour": 9,
+  "timeformat": "%Y-%m-%d %H:%M",
+  "linewrap": 80,
+  "encrypt": false,
+  "editor": "",
+  "default_minute": 0,
+  "highlight": true,
+  "password": "",
+  "journals": {
+    "default": "features/journals/tags-216.journal"
+  },
+  "tagsymbols": "@"
+}
diff --git a/features/data/journals/tags-216.journal b/features/data/journals/tags-216.journal
new file mode 100644
index 00000000..4bd942b9
--- /dev/null
+++ b/features/data/journals/tags-216.journal
@@ -0,0 +1,2 @@
+2013-06-10 15:40 I programmed for @OS/2.
+Almost makes me want to go back to @C++, though. (Still better than @C#).
diff --git a/features/data/journals/tags.journal b/features/data/journals/tags.journal
index bfd49cf4..b4186a53 100644
--- a/features/data/journals/tags.journal
+++ b/features/data/journals/tags.journal
@@ -5,3 +5,4 @@
 
 2013-06-10 15:40 I met with @dan.
 As alway's he shared his latest @idea on how to rule the world with me.
+inst
diff --git a/features/tagging.feature b/features/tagging.feature
index a30c1052..2d317938 100644
--- a/features/tagging.feature
+++ b/features/tagging.feature
@@ -20,3 +20,14 @@ Feature: Tagging
             @idea                : 1
             @dan                 : 1
             """
+
+    Scenario: Tags should allow certain special characters
+        Given we use the config "tags-216.json"
+        When we run "jrnl --tags"
+        Then we should get no error
+        and the output should be
+            """
+            @os/2                : 1
+            @c++                 : 1
+            @c#                  : 1
+            """