- a few bug fix