Issue #226 Fix polling