final fix for redirect