Fix navigation tracking

As per discusion with @kungpochicken