Fix redirect conditions again