fixing client side