fix polling problem?