Fix active navigation helper