Fixed some redirection