resolve code issue