FIX: current index interface bug