try to fix some redirection loops