Redirection issue fix