Fixed navcurr override issue