diff --git a/PBot/Commands.pm b/PBot/Commands.pm
index 0e6c9fd7..922d3129 100644
--- a/PBot/Commands.pm
+++ b/PBot/Commands.pm
@@ -234,6 +234,7 @@ sub interpreter {
 
             $context->{action} = $context->{arguments};
             $context->{arguments} = $self->{pbot}->{factoids}->expand_factoid_vars($context);
+            $context->{arglist} = $self->{pbot}->{interpreter}->make_args($context->{arguments});
             delete $context->{action};
 
             $context->{no_nickoverride} = 1;