Fixed double redirect