Fix multiple level redirects