diff --git a/lib/DDG/Goodie/Pi.pm b/lib/DDG/Goodie/Pi.pm
index 75f257a29..dd0daaa63 100755
--- a/lib/DDG/Goodie/Pi.pm
+++ b/lib/DDG/Goodie/Pi.pm
@@ -22,12 +22,12 @@ my $PI = '3.14159265358979323846264338327950288419716939937510582097494459230781
          '147303598253490428755468731159562863882353787593751957781857780532171226806613001927876611195909216'.
          '4201989';
 
-my $PI_max_digits = length($PI);
+my $PI_max_digits = length($PI) - 2;
 
 handle query_raw => sub {
 
     return unless $_ =~ /^(?:pi|π)?\s*(?:to|first)?\s*(?<decimal>\d+)\s*(?:(?:decimal|digit)s?)?\s*(?:of\s+(?:pi|π))?$/i && 
-                        $+{decimal} > 0 && $+{decimal} < $PI_max_digits;
+        $+{decimal} > 0 && $+{decimal} <= $PI_max_digits;
 
     my $answer = substr $PI, 0, ( $1 + 2 );
     return $answer, structured_answer => {
diff --git a/t/Pi.t b/t/Pi.t
index 0fc04ecb1..c451af546 100755
--- a/t/Pi.t
+++ b/t/Pi.t
@@ -34,7 +34,9 @@ ddg_goodie_test(
     'π to 6 digits' => build_test("3.141592", 6),
 
     'pi ff' => undef,
-    'pi 3f2' => undef
+    'pi 3f2' => undef,
+    'pi 1001' => undef,
+    'pi 1002' => undef,
 );
 
 done_testing;