diff --git a/cpp/src/db/id_generators.cpp b/cpp/src/db/id_generators.cpp
index 3541048413..bb7da2c70d 100644
--- a/cpp/src/db/id_generators.cpp
+++ b/cpp/src/db/id_generators.cpp
@@ -1,5 +1,6 @@
 #include <chrono>
 #include <assert.h>
+#include <iostream>
 
 #include "id_generators.h"
 
@@ -17,18 +18,17 @@ IDNumber SimpleIDGenerator::getNextIDNumber() {
     return micros * MAX_IDS_PER_MICRO;
 }
 
-IDNumbers&& SimpleIDGenerator::getNextIDNumbers(size_t n) {
+void SimpleIDGenerator::getNextIDNumbers(size_t n, IDNumbers& ids) {
     assert(n < MAX_IDS_PER_MICRO);
     auto now = std::chrono::system_clock::now();
     auto micros = std::chrono::duration_cast<std::chrono::microseconds>(
             now.time_since_epoch()).count();
     micros *= MAX_IDS_PER_MICRO;
 
-    IDNumbers ids = IDNumbers(n);
+    ids.clear();
     for (int pos=0; pos<n; ++pos) {
-        ids[pos] = micros + pos;
+        ids.push_back(micros+pos);
     }
-    return std::move(ids);
 }
 
 
diff --git a/cpp/src/db/id_generators.h b/cpp/src/db/id_generators.h
index 6f24bf36e2..0a9db16c21 100644
--- a/cpp/src/db/id_generators.h
+++ b/cpp/src/db/id_generators.h
@@ -10,7 +10,7 @@ namespace engine {
 class IDGenerator {
 public:
     virtual IDNumber getNextIDNumber() = 0;
-    virtual IDNumbers&& getNextIDNumbers(size_t n_) = 0;
+    virtual void getNextIDNumbers(size_t n, IDNumbers& ids) = 0;
 
     virtual ~IDGenerator();
 
@@ -20,7 +20,7 @@ public:
 class SimpleIDGenerator : public IDGenerator {
 public:
     virtual IDNumber getNextIDNumber() override;
-    virtual IDNumbers&& getNextIDNumbers(size_t n_) override;
+    virtual void getNextIDNumbers(size_t n, IDNumbers& ids) override;
 
 private:
     const size_t MAX_IDS_PER_MICRO = 1000;