Fix Navigation, Make static invocation