Repaired: tricky redirect