fix bug about send will (still ugly)