routeFallback fix