diff --git a/client_test.go b/client_test.go
index 4db9156c5..2fde7a7c7 100644
--- a/client_test.go
+++ b/client_test.go
@@ -355,7 +355,7 @@ func TestClient_ImportValue(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	min, cnt, err = frame.FieldMin(filter, fld.Name) // TODO: change this to use the client
+	min, cnt, err = frame.FieldMin(filter, fld.Name)
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/executor.go b/executor.go
index 022e48dda..83f35e7d3 100644
--- a/executor.go
+++ b/executor.go
@@ -1782,7 +1782,7 @@ type MinCount struct {
 
 // Smaller returns the smaller of the two MinCounts.
 func (mc *MinCount) Smaller(other MinCount) MinCount {
-	if mc.Count == 0 || other.Count < mc.Count {
+	if mc.Count == 0 || (other.Min < mc.Min && other.Count > 0) {
 		return other
 	}
 	return MinCount{
@@ -1799,7 +1799,7 @@ type MaxCount struct {
 
 // Larger returns the larger of the two MaxCounts.
 func (mc *MaxCount) Larger(other MaxCount) MaxCount {
-	if mc.Count == 0 || other.Count < mc.Count {
+	if mc.Count == 0 || (other.Max > mc.Max && other.Count > 0) {
 		return other
 	}
 	return MaxCount{
diff --git a/executor_test.go b/executor_test.go
index f2e0d210d..d5fa6e5d6 100644
--- a/executor_test.go
+++ b/executor_test.go
@@ -599,6 +599,98 @@ func TestExecutor_Execute_TopN_Attr_Src(t *testing.T) {
 	}
 }
 
+// Ensure Min()  and Max() queries can be executed.
+func TestExecutor_Execute_MinMax(t *testing.T) {
+	hldr := test.MustOpenHolder()
+	defer hldr.Close()
+	e := test.NewExecutor(hldr.Holder, test.NewCluster(1))
+
+	idx, err := hldr.CreateIndex("i", pilosa.IndexOptions{})
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	if _, err := idx.CreateFrame("f", pilosa.FrameOptions{
+		RangeEnabled: true,
+		Fields: []*pilosa.Field{
+			{Name: "foo", Type: pilosa.FieldTypeInt, Min: -10, Max: 100},
+		},
+	}); err != nil {
+		t.Fatal(err)
+	}
+
+	if _, err := e.Execute(context.Background(), "i", test.MustParse(`
+		SetBit(frame=f, row=0, col=0)
+		SetBit(frame=f, row=0, col=3)
+		SetBit(frame=f, row=0, col=`+strconv.Itoa(SliceWidth+1)+`)
+		SetBit(frame=f, row=1, col=1)
+		SetBit(frame=f, row=2, col=`+strconv.Itoa(SliceWidth+2)+`)
+
+		SetFieldValue(frame=f, foo=20, col=0)
+		SetFieldValue(frame=f, foo=-5, col=1)
+		SetFieldValue(frame=f, foo=-5, col=2)
+		SetFieldValue(frame=f, foo=10, col=3)
+		SetFieldValue(frame=f, foo=30, col=`+strconv.Itoa(SliceWidth)+`)
+		SetFieldValue(frame=f, foo=40, col=`+strconv.Itoa(SliceWidth+2)+`)
+		SetFieldValue(frame=f, foo=50, col=`+strconv.Itoa((5*SliceWidth)+100)+`)
+		SetFieldValue(frame=f, foo=60, col=`+strconv.Itoa(SliceWidth+1)+`)
+	`), nil, nil); err != nil {
+		t.Fatal(err)
+	}
+
+	t.Run("Min", func(t *testing.T) {
+		tests := []struct {
+			filter string
+			exp    int64
+			cnt    int64
+		}{
+			{filter: ``, exp: -5, cnt: 2},
+			{filter: `Bitmap(frame=f, row=0)`, exp: 10, cnt: 1},
+			{filter: `Bitmap(frame=f, row=1)`, exp: -5, cnt: 1},
+			{filter: `Bitmap(frame=f, row=2)`, exp: 40, cnt: 1},
+		}
+		for i, tt := range tests {
+			var pql string
+			if tt.filter == "" {
+				pql = `Min(frame=f, field=foo)`
+			} else {
+				pql = fmt.Sprintf(`Min(%s, frame=f, field=foo)`, tt.filter)
+			}
+			if result, err := e.Execute(context.Background(), "i", test.MustParse(pql), nil, nil); err != nil {
+				t.Fatal(err)
+			} else if !reflect.DeepEqual(result[0], pilosa.MinCount{Min: tt.exp, Count: tt.cnt}) {
+				t.Fatalf("unexpected result, test %d: %s", i, spew.Sdump(result))
+			}
+		}
+	})
+
+	t.Run("Max", func(t *testing.T) {
+		tests := []struct {
+			filter string
+			exp    int64
+			cnt    int64
+		}{
+			{filter: ``, exp: 60, cnt: 1},
+			{filter: `Bitmap(frame=f, row=0)`, exp: 60, cnt: 1},
+			{filter: `Bitmap(frame=f, row=1)`, exp: -5, cnt: 1},
+			{filter: `Bitmap(frame=f, row=2)`, exp: 40, cnt: 1},
+		}
+		for i, tt := range tests {
+			var pql string
+			if tt.filter == "" {
+				pql = `Max(frame=f, field=foo)`
+			} else {
+				pql = fmt.Sprintf(`Max(%s, frame=f, field=foo)`, tt.filter)
+			}
+			if result, err := e.Execute(context.Background(), "i", test.MustParse(pql), nil, nil); err != nil {
+				t.Fatal(err)
+			} else if !reflect.DeepEqual(result[0], pilosa.MaxCount{Max: tt.exp, Count: tt.cnt}) {
+				t.Fatalf("unexpected result, test %d: %s", i, spew.Sdump(result))
+			}
+		}
+	})
+}
+
 // Ensure a Sum() query can be executed.
 func TestExecutor_Execute_Sum(t *testing.T) {
 	hldr := test.MustOpenHolder()