some little bug fix!