fixed client tracking bug