diff --git a/Algebraic_kernel_d/include/CGAL/Algebraic_curve_kernel_2.h b/Algebraic_kernel_d/include/CGAL/Algebraic_curve_kernel_2.h
index 27e28654eb9..f9aee1f764b 100755
--- a/Algebraic_kernel_d/include/CGAL/Algebraic_curve_kernel_2.h
+++ b/Algebraic_kernel_d/include/CGAL/Algebraic_curve_kernel_2.h
@@ -630,9 +630,18 @@ public:
     //! coprime
     struct Has_finite_number_of_intersections_2 :
         public Binary_function< Polynomial_2_CGAL, Polynomial_2_CGAL, bool > {
-               
+         
+        bool operator()(const Internal_polynomial_2& f,
+                        const Internal_polynomial_2& g) const {
+            // if curve ids are the same - non-decomposable
+            if(f.id() == g.id())
+                return true;
+            NiX2CGAL_converter cvt;
+            return (*this)(cvt(f), cvt(g));
+        }
+     
         bool operator()(const Polynomial_2_CGAL& f,
-                const Polynomial_2_CGAL& g) const {
+                        const Polynomial_2_CGAL& g) const {
             // if curve ids are the same - non-decomposable
             if(f.id() == g.id())
                 return true;
diff --git a/Algebraic_kernel_d/include/CGAL/Algebraic_curve_kernel_2/Curve_pair_analysis_2.h b/Algebraic_kernel_d/include/CGAL/Algebraic_curve_kernel_2/Curve_pair_analysis_2.h
index e4ffc3ee363..93365b5c7a7 100755
--- a/Algebraic_kernel_d/include/CGAL/Algebraic_curve_kernel_2/Curve_pair_analysis_2.h
+++ b/Algebraic_kernel_d/include/CGAL/Algebraic_curve_kernel_2/Curve_pair_analysis_2.h
@@ -323,7 +323,7 @@ public:
      *
      * \pre \c x is finite
      */
-    Status_line_1& status_line_at_exact_x(X_coordinate_1 x) const {
+    Status_line_1 status_line_at_exact_x(X_coordinate_1 x) const {
         // CGAL_precondition(x is finite ??);
         return status_line_for_x(x);
     }