Fixed double nav-current issue in #1722