diff --git a/arangod/Aql/CollectBlock.cpp b/arangod/Aql/CollectBlock.cpp
index 07bb83d827..669876232c 100644
--- a/arangod/Aql/CollectBlock.cpp
+++ b/arangod/Aql/CollectBlock.cpp
@@ -312,7 +312,7 @@ int SortedCollectBlock::getOrSkipSome(size_t atLeast, size_t atMost,
         // we already had a group, check if the group has changed
         size_t i = 0;
         
-        if (_pos > 0) {
+        if (_pos > 0 && !skipping) {
           // re-use already copied AQLValues
           for (auto& it : _groupRegisters) {
             res->copyColValuesFromFirstRow(_pos, it.second);
@@ -345,7 +345,7 @@ int SortedCollectBlock::getOrSkipSome(size_t atLeast, size_t atMost,
         // increase output row count
         ++skipped;
 
-        if (skipped == atMost) {
+        if (skipped == atMost && !skipping) {
           // output is full
           // do NOT advance input pointer
           result = res.release();
diff --git a/arangod/Cluster/ClusterMethods.cpp b/arangod/Cluster/ClusterMethods.cpp
index 4c78d6637b..cc700d2eea 100644
--- a/arangod/Cluster/ClusterMethods.cpp
+++ b/arangod/Cluster/ClusterMethods.cpp
@@ -50,7 +50,7 @@
 using namespace arangodb::basics;
 using namespace arangodb::rest;
 
-static double const CL_DEFAULT_TIMEOUT = 90.0;
+static double const CL_DEFAULT_TIMEOUT = 120.0;
 
 namespace {
 template<typename T>