resolve few issue