diff --git a/Operations_on_polyhedra/include/CGAL/intersection_of_Polyhedra_3.h b/Operations_on_polyhedra/include/CGAL/intersection_of_Polyhedra_3.h
index 09f096d7f4f..65ec889962c 100644
--- a/Operations_on_polyhedra/include/CGAL/intersection_of_Polyhedra_3.h
+++ b/Operations_on_polyhedra/include/CGAL/intersection_of_Polyhedra_3.h
@@ -435,9 +435,9 @@ public:
   template<class Iterator>
   void annotate_graph(Iterator begin,Iterator end){
     for(Iterator it=begin;it!=end;++it){
-      typename Node_to_infos_map::iterator it_res=node_infos.find(it->first);
+      typename Node_to_infos_map::iterator it_res=node_infos.find(std::distance(begin, it));
       if (it_res!=node_infos.end())
-        it->second.make_terminal();
+        it->make_terminal();
     }
   }
   
diff --git a/Operations_on_polyhedra/test/Operations_on_polyhedra/a_union_b_locally_remeshed.cpp b/Operations_on_polyhedra/test/Operations_on_polyhedra/a_union_b_locally_remeshed.cpp
index 8de268a36b9..83ffe6c5d82 100644
--- a/Operations_on_polyhedra/test/Operations_on_polyhedra/a_union_b_locally_remeshed.cpp
+++ b/Operations_on_polyhedra/test/Operations_on_polyhedra/a_union_b_locally_remeshed.cpp
@@ -207,7 +207,7 @@ int main(int argc,char** argv) {
   //~ CGAL::Polygon_mesh_processing::isotropic_remeshing(P, faces,0.1);
   CGAL::Polygon_mesh_processing::isotropic_remeshing(
     faces,0.3, union_,
-    PMP::parameters::edge_is_constrained_map(Edge_mark_property_map<Polyhedron>()).number_of_iterations(15).smooth_along_features(true)
+    PMP::parameters::edge_is_constrained_map(Edge_mark_property_map<Polyhedron>()).number_of_iterations(15).relax_constraints(true)
   );
 
   output.open("P_union_Q_remeshed.off");