Fix #73 client side. Damn it I forgot it earlier