fix some little bug