polling fixes on failure