Fix navigation view controller assumption.