Fix for Active Class