Fix index movement when polling