get_current_index Fix #1