Fix poll bug