Fix for redirects