fix some bug..