better polls behavior