Fix navigation event triggers, ref #135