Fixed poller bug