Fix client side receiving