fixed poll code