fixed some little bug