fix constant polling