Again fixing malfunctioning navs.