Fix client polling