fix polling issue