Hope fully fix double redirect errors