Fixed active class issue