Fixing a bug with configurable polling