Fix delayed polling