fix some bug
..