hopefully this is really final fix for redirect