Fixed bug in nav-last