fixed redirection issue