1 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/com/amazon/carbonado/repo/jdbc/JDBCStorage.java b/src/main/java/com/amazon/carbonado/repo/jdbc/JDBCStorage.java
index 598f9f6..54ff24a 100644
--- a/src/main/java/com/amazon/carbonado/repo/jdbc/JDBCStorage.java
+++ b/src/main/java/com/amazon/carbonado/repo/jdbc/JDBCStorage.java
@@ -472,9 +472,9 @@ class JDBCStorage<S extends Storable> extends StandardQueryFactory<S>
             }
 
             if (remainderOrdering != null && remainderOrdering.size() > 0) {
-                // FIXME: use MergeSortBuffer
                 executor = new SortedQueryExecutor<S>
-                    (null, executor, sqlOrdering, remainderOrdering);
+                    (new SortedQueryExecutor.MergeSortSupport(),
+                     executor, sqlOrdering, remainderOrdering);
             }
 
             return executor;