few bug fixed
few bug fixed