Fix polling handling.