Fixing client side
Fixing client side