fixed poll stuff