diff --git a/src/internal/Object.h b/src/internal/Object.h
index bbd6458de..3f27e6c0e 100644
--- a/src/internal/Object.h
+++ b/src/internal/Object.h
@@ -66,9 +66,7 @@ template<typename Scalar, typename Derived> class EiObject
     template<typename OtherDerived>
     void _copy_helper(const EiObject<Scalar, OtherDerived>& other)
     {
-      if(HasDynamicSize
-      && RowsAtCompileTime <= EI_LOOP_UNROLLING_LIMIT
-      && ColsAtCompileTime <= EI_LOOP_UNROLLING_LIMIT)
+      if(UnrollCount > 0 && UnrollCount <= EI_LOOP_UNROLLING_LIMIT)
         EiLoop<UnrollCount, RowsAtCompileTime>::copy(*this, other);
       else
         for(int i = 0; i < rows(); i++)
diff --git a/src/internal/Util.h b/src/internal/Util.h
index 60413a8af..e4c9a9e57 100644
--- a/src/internal/Util.h
+++ b/src/internal/Util.h
@@ -69,7 +69,7 @@ struct EiForwardDecl<EiMatrix<_Scalar, _Rows, _Cols> >
 
 const int EiDynamic = -1;
 
-#define EI_LOOP_UNROLLING_LIMIT 8
+#define EI_LOOP_UNROLLING_LIMIT 25
 
 #define EI_UNUSED(x) (void)x