#JC-1819 Poll doesn't preview correctly in some circumstances

switch flag has been removed from SwitchPoll() in order to fix the bug