fix for poll changes in same session and stuff