Fix iterator+erase issue