fix some BUG