restore poll scheme and fix bug