Fix for polling locking up on timed polls