Last nav fix