Issue #226 Fix polling to repeat after timeout