fix some bug...