diff --git a/processing/src/main/java/io/druid/query/TimewarpOperator.java b/processing/src/main/java/io/druid/query/TimewarpOperator.java
index ac2a5f8c930..4f9bc597f74 100644
--- a/processing/src/main/java/io/druid/query/TimewarpOperator.java
+++ b/processing/src/main/java/io/druid/query/TimewarpOperator.java
@@ -22,7 +22,6 @@ package io.druid.query;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.base.Function;
-import com.google.common.collect.ImmutableMap;
 import com.metamx.common.guava.Sequence;
 import com.metamx.common.guava.Sequences;
 import io.druid.data.input.MapBasedRow;
@@ -80,7 +79,7 @@ public class TimewarpOperator<T> implements PostProcessingOperator<T>
     return new QueryRunner<T>()
     {
       @Override
-      public Sequence<T> run(Query<T> query)
+      public Sequence<T> run(final Query<T> query)
       {
         final long offset = computeOffset(now);
 
@@ -101,16 +100,22 @@ public class TimewarpOperator<T> implements PostProcessingOperator<T>
                 if (input instanceof Result) {
                   Result res = (Result) input;
                   Object value = res.getValue();
+                  final DateTime timestamp = res.getTimestamp().minus(offset);
                   if (value instanceof TimeBoundaryResultValue) {
                     TimeBoundaryResultValue boundary = (TimeBoundaryResultValue) value;
-                    value = new TimeBoundaryResultValue(
-                        ImmutableMap.of(
-                            TimeBoundaryQuery.MIN_TIME, boundary.getMinTime().minus(offset),
-                            TimeBoundaryQuery.MAX_TIME, new DateTime(Math.min(boundary.getMaxTime().getMillis() - offset, now))
-                        )
-                    );
+
+                    DateTime minTime = null;
+                    try{
+                      minTime = boundary.getMinTime();
+                    } catch(IllegalArgumentException e) {}
+
+                    return (T) ((TimeBoundaryQuery) query).buildResult(
+                        timestamp,
+                        minTime,
+                        boundary.getMaxTime()
+                    ).iterator().next();
                   }
-                  return (T) new Result(res.getTimestamp().minus(offset), value);
+                  return (T) new Result(timestamp, value);
                 } else if (input instanceof MapBasedRow) {
                   MapBasedRow row = (MapBasedRow) input;
                   return (T) new MapBasedRow(row.getTimestamp().minus(offset), row.getEvent());