More control navigation issue fix.