Fix the polling