Fix multiple navigation behavior