few fix bug