fixes polling