Fixed poll handling