fix some little BUG