diff --git a/Solver_interface/include/CGAL/Eigen_vector.h b/Solver_interface/include/CGAL/Eigen_vector.h
index 484d6208045..8e9b1f87062 100644
--- a/Solver_interface/include/CGAL/Eigen_vector.h
+++ b/Solver_interface/include/CGAL/Eigen_vector.h
@@ -42,14 +42,13 @@ public:
 // Public operations
 public:
 
-#ifndef CGAL_CFG_MATCHING_BUG_6
-  using EigenType::operator=;
-#else
   Eigen_vector<T>& operator=(const Eigen_vector<T>& other){
     return static_cast<EigenType&>(*this) = other.eigen_object();
   }
-#endif
 
+  Eigen_vector<T>& operator=(const EigenType& other){
+    return static_cast<EigenType&>(*this) = other;
+  }
 
    /// Create a vector initialized with zeros.
    Eigen_vector(int dimension)
diff --git a/Surface_mesh_parameterization/test/Surface_mesh_parameterization/extensive_parameterization_test.cpp b/Surface_mesh_parameterization/test/Surface_mesh_parameterization/extensive_parameterization_test.cpp
index f65927f0b91..d316ed13096 100644
--- a/Surface_mesh_parameterization/test/Surface_mesh_parameterization/extensive_parameterization_test.cpp
+++ b/Surface_mesh_parameterization/test/Surface_mesh_parameterization/extensive_parameterization_test.cpp
@@ -33,7 +33,8 @@
 #include <CGAL/OpenNL/linear_solver.h>
 #ifdef CGAL_EIGEN3_ENABLED
     #include <CGAL/Eigen_solver_traits.h>
-#elif defined(CGAL_USE_TAUCS)
+#endif
+#ifdef CGAL_USE_TAUCS
     #include <CGAL/Taucs_solver_traits.h>
 #endif