fixed few bug