resolve redirect issue