final fix for routes