Updated redirection issue