bbc35e6 Maybe fix redirect loop