fixed State polling is not currently working #7