Really fix redirect this time and I mean it really