fixed infinite polling (but needs more work)