fix polling