2 files changed, 4 insertions, 3 deletions
diff --git a/src/Witness_complex/include/gudhi/Active_witness/Active_witness.h b/src/Witness_complex/include/gudhi/Active_witness/Active_witness.h
index debbd286..c3edc0b7 100644
--- a/src/Witness_complex/include/gudhi/Active_witness/Active_witness.h
+++ b/src/Witness_complex/include/gudhi/Active_witness/Active_witness.h
@@ -50,7 +50,7 @@ public:
   INS_iterator iterator_end_;
 
   Active_witness(INS_range search_range)
-    : search_range_(search_range), iterator_last_(search_range.begin()), iterator_end_(search_range.end())
+    : search_range_(search_range), iterator_last_(search_range_.begin()), iterator_end_(search_range_.end())
   {
     nearest_landmark_table_.push_back(*iterator_last_);
   }
diff --git a/src/Witness_complex/include/gudhi/Active_witness/Active_witness_iterator.h b/src/Witness_complex/include/gudhi/Active_witness/Active_witness_iterator.h
index 5b040914..b0a88662 100644
--- a/src/Witness_complex/include/gudhi/Active_witness/Active_witness_iterator.h
+++ b/src/Witness_complex/include/gudhi/Active_witness/Active_witness_iterator.h
@@ -86,12 +86,13 @@ private :
     // if the id of the current landmark is the same as the last one
     if (lh_->first == aw_->iterator_last_->first) {
       // if the next iterator is end, lh_it = end pointer
-      if (++(aw_->iterator_last_) == aw_->iterator_end_) {
+      INS_iterator next_it = aw_->iterator_last_; next_it++;
+      if (next_it == aw_->iterator_end_) {
         is_end_ = true;
         return;
       }
       else {
-        //aw_->iterator_last_ = ++(aw_->iterator_last_);
+        ++(aw_->iterator_last_);
         aw_->nearest_landmark_table_.push_back(*(aw_->iterator_last_));
       }
     }