polling bug fixed