Fixed TODO: _previous_i_entry = _previous_entry at start