Another try to fix redirects