Fixed the whole update polling issue