Fix birectional navigation