Fixed repolling issue