fix embarrassing bug, poll and remove wrong call on internal set