repaire some bug