Fix some small bug
Fix BUG