fixed how we do polling with samuel's patch