diff --git a/ChangeLog b/ChangeLog
index 4b2b52e92..8c72f41ab 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -45,6 +45,8 @@
 - TW-1860 Change signature of Task::getAnnotations
 - TW-1861 Truncated description when adding annotation
           (thanks to eezewaek).
+- TW-1869 segmentation fault (on unusual installation)
+          (thanks to Eric Hymowitz).
 - TW-1873 Specify different path to extensions/hooks directory
           (thanks to Eli).
 - TW-1877 task done, task edit, task is now pending
diff --git a/src/CLI2.cpp b/src/CLI2.cpp
index 271a39e23..ddf51e2e2 100644
--- a/src/CLI2.cpp
+++ b/src/CLI2.cpp
@@ -376,9 +376,7 @@ void CLI2::handleArg0 ()
     A2 cal ("calendar", Lexer::Type::word);
     _args.push_back (cal);
   }
-  else if (basename == "task" ||
-           basename == "tw" ||
-           basename == "t")
+  else
   {
     _args.push_back (a);
   }