fix few bug