Fix the polling again