few bug fix 2