Polling bug fix