Final redirect fix... hopefully