diff --git a/PBot/Interpreter.pm b/PBot/Interpreter.pm
index 7c97b6b5..aade7a24 100644
--- a/PBot/Interpreter.pm
+++ b/PBot/Interpreter.pm
@@ -204,7 +204,7 @@ sub interpret {
 
   $tonick = $nick if defined $tonick and $tonick eq 'me';
 
-  if ($keyword !~ /^(factrem|forget|factdel|factadd|add|factfind|find|factshow|show|forget|factdel|factset|factchange|change|msg|tell|cc|eval|u|udict|ud|actiontrigger|urban|perl)/) {
+  if ($keyword !~ /^(?:factrem|forget|set|factdel|factadd|add|factfind|find|factshow|show|forget|factdel|factset|factchange|change|msg|tell|cc|eval|u|udict|ud|actiontrigger|urban|perl)$/) {
     $keyword =~ s/(\w+)([?!.]+)$/$1/;
     $arguments =~ s/(?<![\w\/\-\\])me\b/$nick/gi if defined $arguments && $depth <= 2;
     $arguments =~ s/(?<![\w\/\-\\])my\b/${nick}'s/gi if defined $arguments && $depth <= 2;
@@ -278,7 +278,7 @@ sub handle_result {
   if (defined $command) {
     my ($cmd, $args) = split / /, $command, 2;
     if (not $self->{pbot}->{commands}->exists($cmd)) {
-      my ($chan, $trigger) = $self->{pbot}->{factoids}->find_factoid($from, $cmd, $args, 1, 0, 1);
+      my ($chan, $trigger) = $self->{pbot}->{factoids}->find_factoid($from, $cmd, $args, 1);
       if(defined $trigger) {
         if ($preserve_whitespace == 0) {
           $preserve_whitespace = $self->{pbot}->{factoids}->{factoids}->hash->{$chan}->{$trigger}->{preserve_whitespace};