@fix some bug