diff --git a/lib/pl/dice.pl b/lib/pl/dice.pl
index d9967809..667a1c6b 100644
--- a/lib/pl/dice.pl
+++ b/lib/pl/dice.pl
@@ -27,7 +27,7 @@ sub diceCheck {
     ( \(? \-? [0-9.]+ [\+\-\/*\^]
       [0-9.\+\-\/*\^()]*
       [0-9.] \)? )
-    [=＝](?:\s|$)
+    \s*[=＝](?:\s|$)
     /ix){
     my $formula = $1;
     if($formula !~ /[\+\-\/\*\^]/) { return ''; }
@@ -37,7 +37,7 @@ sub diceCheck {
     $formula_perl =~ s#\*\*#\^#g;
     my $result = eval($formula);
     if($result eq ''){ return ''; }
-    return "${formula_perl} = ${result}", 'dice';
+    return "${formula_perl} = ${result}", 'dice:calc';
   }
   # SW2
   elsif($::in{'game'} eq 'sw2'){
diff --git a/lib/pl/write.pl b/lib/pl/write.pl
index ad87c89d..9277a57e 100644
--- a/lib/pl/write.pl
+++ b/lib/pl/write.pl
@@ -336,6 +336,7 @@ sub diceCodeCheck {
     ($::in{'info'}, $::in{'system'}) = diceCheck($::in{'comm'});
     if($::in{'info'}){
       $::in{'comm'} =~ s/^(.*?(?:\s|$))//;
+      $::in{'comm'} = '' if $::in{'system'} eq 'dice:calc' && $::in{'comm'} =~ /^[=＝]$/;
       $::in{'info'} .= '<<'.$1;
       return $::in{'info'};
     }