Fixing client side channel tracking