Control navigation issue fix.