diff --git a/src/engine/engine_test.go b/src/engine/engine_test.go
index 307c7c8b55..a2b6907772 100644
--- a/src/engine/engine_test.go
+++ b/src/engine/engine_test.go
@@ -74,10 +74,18 @@ func runQueryRunError(engine EngineI, query string, c *C, expectedErr error) {
 }
 
 func runQuery(engine EngineI, query string, c *C, expectedSeries string) {
+	runQueryExtended(engine, query, c, false, expectedSeries)
+}
 
-	result := []*protocol.Series{}
+func runQueryExtended(engine EngineI, query string, c *C, appendPoints bool, expectedSeries string) {
+
+	var result []*protocol.Series
 	err := engine.RunQuery(nil, "", query, func(series *protocol.Series) error {
-		result = append(result, series)
+		if appendPoints && result != nil {
+			result[0].Points = append(result[0].Points, series.Points...)
+		} else {
+			result = append(result, series)
+		}
 		return nil
 	})
 
@@ -921,6 +929,50 @@ func (self *EngineSuite) TestQueryWithMergedTables(c *C) {
   ]`)
 }
 
+func (self *EngineSuite) TestQueryWithMergedTablesWithPointsAppend(c *C) {
+	engine := createEngine(c, `[
+    {
+      "points": [
+        { "values": [{ "int64_value": 1 }, { "int64_value": 1 }], "timestamp": 1381346701000000, "sequence_number": 1 },
+        { "values": [{ "int64_value": 1 }, { "int64_value": 4 }], "timestamp": 1381346707000000, "sequence_number": 1 }
+      ],
+      "name": "foo",
+      "fields": ["a", "b"]
+    },
+    {
+      "points": [],
+      "name": "foo",
+      "fields": ["a", "b"]
+    },
+    {
+      "points": [
+        { "values": [{ "int64_value": 1 }, { "int64_value": 2 }], "timestamp": 1381346705000000, "sequence_number": 1 },
+        { "values": [{ "int64_value": 1 }, { "int64_value": 3 }], "timestamp": 1381346706000000, "sequence_number": 1 }
+      ],
+      "name": "bar",
+      "fields": ["a", "b"]
+    },
+    {
+      "points": [],
+      "name": "bar",
+      "fields": ["a", "b"]
+    }
+  ]`)
+
+	runQueryExtended(engine, "select * from foo merge bar;", c, true, `[
+    {
+      "points": [
+        { "values": [{ "int64_value": 1 }, { "int64_value": 1 }, null, null], "timestamp": 1381346701000000, "sequence_number": 1 },
+        { "values": [null, null, { "int64_value": 1 }, { "int64_value": 2 }], "timestamp": 1381346705000000, "sequence_number": 1 },
+        { "values": [null, null, { "int64_value": 1 }, { "int64_value": 3 }], "timestamp": 1381346706000000, "sequence_number": 1 },
+        { "values": [{ "int64_value": 1 }, { "int64_value": 4 }, null, null], "timestamp": 1381346707000000, "sequence_number": 1 }
+      ],
+      "name": "foo_merge_bar",
+      "fields": ["foo.a", "foo.b", "bar.a", "bar.b"]
+    }
+  ]`)
+}
+
 func (self *EngineSuite) TestCountQueryWithGroupByTimeInvalidNumberOfArguments(c *C) {
 	err := common.NewQueryError(common.WrongNumberOfArguments, "time function only accepts one argument")
 	engine := createEngine(c, `[]`)
diff --git a/src/engine/merge.go b/src/engine/merge.go
index 40e4936605..82fcd2c204 100644
--- a/src/engine/merge.go
+++ b/src/engine/merge.go
@@ -92,7 +92,7 @@ func getMergeYield(table1, table2 string, yield func(*protocol.Series) error) fu
 
 			if *s1[0].Points[0].Timestamp > *s2[0].Points[0].Timestamp {
 				// s1 fields = null, s2 fields = some values
-				points = s2[0].Points[:1]
+				points = []*protocol.Point{s2[0].Points[0]}
 				for _, p := range points {
 					p.Values = append(nullValues1, p.Values...)
 				}
@@ -102,7 +102,7 @@ func getMergeYield(table1, table2 string, yield func(*protocol.Series) error) fu
 				}
 			} else {
 				// s1 fields = null, s2 fields = some values
-				points = s1[0].Points[:1]
+				points = []*protocol.Point{s1[0].Points[0]}
 				for _, p := range points {
 					p.Values = append(p.Values, nullValues2...)
 				}