Fix issue on client side