final nav fix?