diff --git a/PBot/Factoids.pm b/PBot/Factoids.pm
index eb5f5e2b..3a9f6269 100644
--- a/PBot/Factoids.pm
+++ b/PBot/Factoids.pm
@@ -356,7 +356,7 @@ sub find_factoid {
 sub expand_factoid_vars {
   my ($self, $from, $action) = @_;
 
-  while ($action =~ /(?<!\\)\$([a-zA-Z0-9_:\-]+)/g) {
+  while ($action =~ /(?<!\\)\$([a-zA-Z0-9_:\-#]+)/g) {
     my $v = $1;
     next if $v =~ m/^(nick|channel|randomnick|args|arg\[.+\])$/; # don't override special variables
 
@@ -365,7 +365,7 @@ sub expand_factoid_vars {
       $modifier = $1;
     }
 
-    if ($modifier =~ m/^:(#.*|global)$/i) {
+    if ($modifier =~ m/^:(#[^:]+|global)/i) {
       $from = $1;
       $from = '.*' if lc $from eq 'global';
     }
diff --git a/PBot/VERSION.pm b/PBot/VERSION.pm
index c3193800..f42f8978 100644
--- a/PBot/VERSION.pm
+++ b/PBot/VERSION.pm
@@ -13,7 +13,7 @@ use warnings;
 # These are set automatically by the build/commit script
 use constant {
   BUILD_NAME     => "PBot",
-  BUILD_REVISION => 1268,
+  BUILD_REVISION => 1269,
   BUILD_DATE     => "2015-10-05",
 };