few bug fix