diff --git a/go.mod b/go.mod
index f089da554..529f2a29d 100644
--- a/go.mod
+++ b/go.mod
@@ -12,7 +12,6 @@ require (
 	github.com/benbjohnson/immutable v0.3.0
 	github.com/buger/jsonparser v1.1.1
 	github.com/cespare/xxhash v1.1.0
-	github.com/claygod/PiHex v0.0.0-20200916193129-5277802bfd7b // indirect
 	github.com/davecgh/go-spew v1.1.1
 	github.com/desertbit/timer v0.0.0-20180107155436-c41aec40b27f // indirect
 	github.com/dustin/go-humanize v1.0.0 // indirect
diff --git a/go.sum b/go.sum
index 2e0ea4375..79fc9f1f6 100644
--- a/go.sum
+++ b/go.sum
@@ -54,8 +54,6 @@ github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghf
 github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
 github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=
 github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
-github.com/claygod/PiHex v0.0.0-20200916193129-5277802bfd7b h1:LmxuKRxYbpulBnhu2ZYLfN92Zs2uitai6s6hpmCIZ1Q=
-github.com/claygod/PiHex v0.0.0-20200916193129-5277802bfd7b/go.mod h1:iQyqZlmS/QK9N12+07jX1OO2xlzguGIE7vDmHh3TX+E=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
 github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
 github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa h1:OaNxuTZr7kxeODyLWsRMC+OD03aFUH+mW6r2d+MWa5Y=
diff --git a/server/grpc_test.go b/server/grpc_test.go
index e2ecae03f..782063859 100644
--- a/server/grpc_test.go
+++ b/server/grpc_test.go
@@ -1007,6 +1007,10 @@ func TestQuerySQLWithError(t *testing.T) {
 			sql: "select _id, age, field_not_found from grouper",
 			err: pilosa.ErrFieldNotFound,
 		},
+		{
+			sql: "select age, color, count(*) from grouper group by field_not_found, age, color",
+			err: pilosa.ErrFieldNotFound,
+		},
 	}
 
 	for i, test := range tests {
diff --git a/sql/select.go b/sql/select.go
index d7afc2eec..2682a5349 100644
--- a/sql/select.go
+++ b/sql/select.go
@@ -598,8 +598,7 @@ func (h handlerSelectGroupBy) Apply(stmt *sqlparser.Select, qm QueryMask, indexF
 
 	rowsQueries := []string{}
 	for _, fieldName := range groupByFieldNames {
-		field := index.Field(fieldName)
-		rowsQueries = append(rowsQueries, Rows(field.Name()))
+		rowsQueries = append(rowsQueries, Rows(fieldName))
 	}
 
 	var wherePQL string