Polling fix