with redirect fix