Fixes polling bug