Bugfix for polling