diff --git a/PBot/Factoids.pm b/PBot/Factoids.pm
index b596d890..141937bb 100644
--- a/PBot/Factoids.pm
+++ b/PBot/Factoids.pm
@@ -485,9 +485,9 @@ sub expand_factoid_vars {
         }
 
         if (not length $mylist[$line]) {
-          substr($action, $offset) =~ s/\s+\$$v$modifier//;
+          substr($action, $offset) =~ s/\s*$a\$$v$modifier//;
         } else {
-          substr($action, $offset) =~ s/\$$v$modifier/$mylist[$line]/;
+          substr($action, $offset) =~ s/$a\$$v$modifier/$mylist[$line]/;
         }
         $offset = $+[0];
       }