Try to fix polling issue