Fix Route Detection