Final nav fix