0.2.2: correctly use self.currentIndex as starting point