Fix poller hanging