some little bug fix