fix client side bug