Further poll index bugfixing.