Fix poll after refactoring