diff --git a/Curved_kernel_via_analysis_2/include/CGAL/Curved_kernel_via_analysis_2/Point_2.h b/Curved_kernel_via_analysis_2/include/CGAL/Curved_kernel_via_analysis_2/Point_2.h
index 8ae6b0d908a..17a96a85c68 100755
--- a/Curved_kernel_via_analysis_2/include/CGAL/Curved_kernel_via_analysis_2/Point_2.h
+++ b/Curved_kernel_via_analysis_2/include/CGAL/Curved_kernel_via_analysis_2/Point_2.h
@@ -215,6 +215,7 @@ public:
             New_rep newrep;
             newrep._m_xy = pt.ptr()->_m_xy;
             newrep._m_x = pt.ptr()->_m_x;
+            newrep._m_is_finite = pt.ptr()->_m_is_finite;
             // TODO set arc_rep in rebind of arc! (eriC)
             //newrep._m_arc_rep = pt.ptr()->_m_arc_rep;
             newrep._m_location = pt.ptr()->_m_location;
@@ -353,7 +354,7 @@ public:
     //! \pre the point's x must be finite (set by construction)
     inline 
     const X_coordinate_1& x() const {
-    
+
         CGAL_precondition_msg(this->ptr()->_m_xy || this->ptr()->_m_x,
           "Denied access to x-coordinate of the curve end \
             lying at x-infinity");
@@ -417,17 +418,14 @@ public:
     }
 
     //!@}      
-
+    
+    //!\name Predicates
+    //!@{
     
 #define CGAL_CKvA_2_GRAB_CK_FUNCTOR_FOR_POINT(X, Y, Z) \
     typename Curved_kernel_via_analysis_2::X Y = \
          Curved_kernel_via_analysis_2::instance().Z(); \
 
-
-//    CGAL_precondition(_ckva() != NULL); 
-//    typename Curved_kernel_via_analysis_2::X Y = 
-//         _ckva()->Z(); 
-        
     //!\brief compares x-coordinates of two points 
     //!
     //!\pre compared points have finite x-coordinates
@@ -477,6 +475,10 @@ public:
 
 #undef CGAL_CKvA_2_GRAB_CK_FUNCTOR_FOR_POINT
 
+    //!@}
+
+    //!\name Comparison operators
+    //!@{
 
     //! comparison operators (only for finite points):
     //! equality