fixed a poll related issue