diff --git a/lib/DDG/Goodie/Average.pm b/lib/DDG/Goodie/Average.pm
index 7f10a9a5e..5215d838f 100644
--- a/lib/DDG/Goodie/Average.pm
+++ b/lib/DDG/Goodie/Average.pm
@@ -22,9 +22,9 @@ attribution twitter => ['crazedpsyc','crazedpsyc'],
 
 
 
-handle query => sub {
+handle remainder => sub {
 
-    my $query = $_;
+    my $query = $req->query_lc;
     
     my $type;
     if ($query =~ m/root mean square/) {