diff --git a/src/commands/CmdCalendar.cpp b/src/commands/CmdCalendar.cpp
index 5dac9b6f9..5a66b2d13 100644
--- a/src/commands/CmdCalendar.cpp
+++ b/src/commands/CmdCalendar.cpp
@@ -334,11 +334,11 @@ int CmdCalendar::execute (std::string& output)
       if (context.commands.find (report) == context.commands.end ())
         throw std::string (STRING_ERROR_DETAILS);
 
-      // TODO Fix this:  cal --> task
+      // TODO Fix this:  cal      --> task
       //                 calendar --> taskendar
 
       // If the executable was "cal" or equivalent, replace it with "task".
-      std::string executable = context.cli._args[0].attribute ("raw");
+      std::string executable = context.cli2._original_args[0];
       auto cal = executable.find ("cal");
       if (cal != std::string::npos)
         executable = executable.substr (0, cal) + PACKAGE;