few bug fixed