Reverting the previous change, and fixing typ'o related to determineActiveClass