BUG -- fix some bug