bugfix polling