Fix for listIndex wonkiness