take 2 of redirect fix